Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev (1bae4e3e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+1 −18

Original line number	Diff line number	Diff line
		@@ -166,7 +166,6 @@ import android.util.Xml;
		import com.android.internal.R;
		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.content.PackageMonitor;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.FastXmlSerializer;
		import com.android.internal.util.IndentingPrintWriter;
		@@ -407,7 +406,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

		private final AppOpsManager mAppOps;

		private final MyPackageMonitor mPackageMonitor;
		private final IPackageManager mIPm;


		@@ -449,8 +447,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

		mAppOps = context.getSystemService(AppOpsManager.class);

		mPackageMonitor = new MyPackageMonitor();

		// Expose private service for system components to use.
		LocalServices.addService(NetworkPolicyManagerInternal.class,
		new NetworkPolicyManagerInternalImpl());
		@@ -582,8 +578,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

		mUsageStats = LocalServices.getService(UsageStatsManagerInternal.class);

		mPackageMonitor.register(mContext, mHandler.getLooper(), UserHandle.ALL, true);

		synchronized (mUidRulesFirstLock) {
		synchronized (mNetworkPoliciesSecondLock) {
		updatePowerSaveWhitelistUL();
		@@ -765,6 +759,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		if (LOGV) Slog.v(TAG, "ACTION_UID_REMOVED for uid=" + uid);
		synchronized (mUidRulesFirstLock) {
		mUidPolicy.delete(uid);
		removeRestrictBackgroundWhitelistedUidUL(uid, true, true);
		updateRestrictionRulesForUidUL(uid);
		synchronized (mNetworkPoliciesSecondLock) {
		writePolicyAL();
		@@ -3660,18 +3655,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		}
		}

		private class MyPackageMonitor extends PackageMonitor {

		@Override
		public void onPackageRemoved(String packageName, int uid) {
		if (LOGV) Slog.v(TAG, "onPackageRemoved: " + packageName + " ->" + uid);
		synchronized (mUidRulesFirstLock) {
		removeRestrictBackgroundWhitelistedUidUL(uid, true, true);
		updateRestrictionRulesForUidUL(uid);
		}
		}
		}

		private class NetworkPolicyManagerInternalImpl extends NetworkPolicyManagerInternal {

		@Override