summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/net/NetworkPolicyManagerService.java19
1 files changed, 1 insertions, 18 deletions
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 5b2067de5f41..d479bfc181da 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -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