Add ALLOW_METERED column to DownloadManager.
Also allow isActiveNetworkMetered() to inspect networks without requiring ACCESS_WIFI_STATE. Bug: 3001465 Change-Id: Ibc23577d4ad941e4f93db417be6b046881dcbfb1
This commit is contained in:
@@ -865,27 +865,39 @@ private NetworkStateTracker makeWimaxStateTracker() {
|
||||
@Override
|
||||
public NetworkQuotaInfo getActiveNetworkQuotaInfo() {
|
||||
enforceAccessPermission();
|
||||
final NetworkState state = getNetworkStateUnchecked(mActiveDefaultNetwork);
|
||||
if (state != null) {
|
||||
try {
|
||||
return mPolicyManager.getNetworkQuotaInfo(state);
|
||||
} catch (RemoteException e) {
|
||||
|
||||
final long token = Binder.clearCallingIdentity();
|
||||
try {
|
||||
final NetworkState state = getNetworkStateUnchecked(mActiveDefaultNetwork);
|
||||
if (state != null) {
|
||||
try {
|
||||
return mPolicyManager.getNetworkQuotaInfo(state);
|
||||
} catch (RemoteException e) {
|
||||
}
|
||||
}
|
||||
return null;
|
||||
} finally {
|
||||
Binder.restoreCallingIdentity(token);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isActiveNetworkMetered() {
|
||||
enforceAccessPermission();
|
||||
final NetworkState state = getNetworkStateUnchecked(mActiveDefaultNetwork);
|
||||
if (state != null) {
|
||||
try {
|
||||
return mPolicyManager.isNetworkMetered(state);
|
||||
} catch (RemoteException e) {
|
||||
|
||||
final long token = Binder.clearCallingIdentity();
|
||||
try {
|
||||
final NetworkState state = getNetworkStateUnchecked(mActiveDefaultNetwork);
|
||||
if (state != null) {
|
||||
try {
|
||||
return mPolicyManager.isNetworkMetered(state);
|
||||
} catch (RemoteException e) {
|
||||
}
|
||||
}
|
||||
return false;
|
||||
} finally {
|
||||
Binder.restoreCallingIdentity(token);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean setRadios(boolean turnOn) {
|
||||
|
||||
Reference in New Issue
Block a user