Add ALLOW_METERED column to DownloadManager. am: 3022ee14a2

Original change: undetermined

Change-Id: I561980350699fd61398f4d3e884aff90f579a617
This commit is contained in:
Jeff Sharkey
2021-05-31 12:28:46 +00:00
committed by Automerger Merge Worker

View File

@@ -865,27 +865,39 @@ private NetworkStateTracker makeWimaxStateTracker() {
@Override @Override
public NetworkQuotaInfo getActiveNetworkQuotaInfo() { public NetworkQuotaInfo getActiveNetworkQuotaInfo() {
enforceAccessPermission(); enforceAccessPermission();
final NetworkState state = getNetworkStateUnchecked(mActiveDefaultNetwork);
if (state != null) { final long token = Binder.clearCallingIdentity();
try { try {
return mPolicyManager.getNetworkQuotaInfo(state); final NetworkState state = getNetworkStateUnchecked(mActiveDefaultNetwork);
} catch (RemoteException e) { if (state != null) {
try {
return mPolicyManager.getNetworkQuotaInfo(state);
} catch (RemoteException e) {
}
} }
return null;
} finally {
Binder.restoreCallingIdentity(token);
} }
return null;
} }
@Override @Override
public boolean isActiveNetworkMetered() { public boolean isActiveNetworkMetered() {
enforceAccessPermission(); enforceAccessPermission();
final NetworkState state = getNetworkStateUnchecked(mActiveDefaultNetwork);
if (state != null) { final long token = Binder.clearCallingIdentity();
try { try {
return mPolicyManager.isNetworkMetered(state); final NetworkState state = getNetworkStateUnchecked(mActiveDefaultNetwork);
} catch (RemoteException e) { if (state != null) {
try {
return mPolicyManager.isNetworkMetered(state);
} catch (RemoteException e) {
}
} }
return false;
} finally {
Binder.restoreCallingIdentity(token);
} }
return false;
} }
public boolean setRadios(boolean turnOn) { public boolean setRadios(boolean turnOn) {