PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replaced deprecated calls to INetworkPolicyManager."

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-03 05:47:41 +00:00
committed by Android (Google) Code Review
parent 393e6532a9 ce015fce0a
commit 482458d46a
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/datausage/DataSaverBackend.java
View File

@@ -29,6 +29,7 @@ import com.android.internal.logging.MetricsProto.MetricsEvent;
import java.util.ArrayList; import java.util.ArrayList;
import static android.net.NetworkPolicyManager.POLICY_ALLOW_METERED_BACKGROUND;
import static android.net.NetworkPolicyManager.POLICY_NONE; import static android.net.NetworkPolicyManager.POLICY_NONE;
import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND; import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
@@ -83,15 +84,8 @@ public class DataSaverBackend {
public void setIsWhitelisted(int uid, String packageName, boolean whitelisted) { public void setIsWhitelisted(int uid, String packageName, boolean whitelisted) {
mWhitelist.put(uid, whitelisted); mWhitelist.put(uid, whitelisted);
try { mPolicyManager.setUidPolicy(uid,
if (whitelisted) { whitelisted ? POLICY_ALLOW_METERED_BACKGROUND : POLICY_NONE);
mIPolicyManager.addRestrictBackgroundWhitelistedUid(uid);
} else {
mIPolicyManager.removeRestrictBackgroundWhitelistedUid(uid);
}
} catch (RemoteException e) {
Log.w(TAG, "Can't reach policy manager", e);
}
if (whitelisted) { if (whitelisted) {
MetricsLogger.action(mContext, MetricsEvent.ACTION_DATA_SAVER_WHITELIST, packageName); MetricsLogger.action(mContext, MetricsEvent.ACTION_DATA_SAVER_WHITELIST, packageName);
} }
@@ -119,11 +113,8 @@ public class DataSaverBackend {
private void loadWhitelist() { private void loadWhitelist() {
mWhitelist = new SparseBooleanArray(); mWhitelist = new SparseBooleanArray();
try { for (int uid : mPolicyManager.getUidsWithPolicy(POLICY_ALLOW_METERED_BACKGROUND)) {
for (int uid : mIPolicyManager.getRestrictBackgroundWhitelistedUids()) { mWhitelist.put(uid, true);
mWhitelist.put(uid, true);
}
} catch (RemoteException e) {
} }
} }