Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only." (1bb0616c) · 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
		@@ -163,7 +163,6 @@ import android.util.Xml;

		import com.android.internal.R;
		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;
		@@ -366,7 +365,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

		private final AppOpsManager mAppOps;

		private final MyPackageMonitor mPackageMonitor;
		private final IPackageManager mIPm;


		@@ -411,8 +409,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());
		@@ -540,8 +536,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

		mUsageStats = LocalServices.getService(UsageStatsManagerInternal.class);

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

		synchronized (mRulesLock) {
		updatePowerSaveWhitelistLocked();
		mPowerManagerInternal = LocalServices.getService(PowerManagerInternal.class);
		@@ -731,6 +725,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		if (LOGV) Slog.v(TAG, "ACTION_UID_REMOVED for uid=" + uid);
		synchronized (mRulesLock) {
		mUidPolicy.delete(uid);
		removeRestrictBackgroundWhitelistedUidLocked(uid, true, true);
		updateRestrictionRulesForUidLocked(uid);
		writePolicyLocked();
		}
		@@ -3479,18 +3474,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 (mRulesLock) {
		removeRestrictBackgroundWhitelistedUidLocked(uid, true, true);
		updateRestrictionRulesForUidLocked(uid);
		}
		}
		}

		private class NetworkPolicyManagerInternalImpl extends NetworkPolicyManagerInternal {

		@Override