Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only."

Browse Source
This commit is contained in:
Treehugger Robot
2016-09-12 21:07:39 +00:00
committed by Gerrit Code Review
parent c7b84e6d0d ecbdb8834d
commit 1bb0616c56
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -163,7 +163,6 @@ import android.util.Xml;
import com.android.internal.R; import com.android.internal.R;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.content.PackageMonitor;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
@@ -366,7 +365,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
private final AppOpsManager mAppOps; private final AppOpsManager mAppOps;
private final MyPackageMonitor mPackageMonitor;
private final IPackageManager mIPm; private final IPackageManager mIPm;
@@ -411,8 +409,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
mAppOps = context.getSystemService(AppOpsManager.class); mAppOps = context.getSystemService(AppOpsManager.class);
mPackageMonitor = new MyPackageMonitor();
// Expose private service for system components to use. // Expose private service for system components to use.
LocalServices.addService(NetworkPolicyManagerInternal.class, LocalServices.addService(NetworkPolicyManagerInternal.class,
new NetworkPolicyManagerInternalImpl()); new NetworkPolicyManagerInternalImpl());
@@ -540,8 +536,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
mUsageStats = LocalServices.getService(UsageStatsManagerInternal.class); mUsageStats = LocalServices.getService(UsageStatsManagerInternal.class);
mPackageMonitor.register(mContext, mHandler.getLooper(), UserHandle.ALL, true);
synchronized (mRulesLock) { synchronized (mRulesLock) {
updatePowerSaveWhitelistLocked(); updatePowerSaveWhitelistLocked();
mPowerManagerInternal = LocalServices.getService(PowerManagerInternal.class); 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); if (LOGV) Slog.v(TAG, "ACTION_UID_REMOVED for uid=" + uid);
synchronized (mRulesLock) { synchronized (mRulesLock) {
mUidPolicy.delete(uid); mUidPolicy.delete(uid);
removeRestrictBackgroundWhitelistedUidLocked(uid, true, true);
updateRestrictionRulesForUidLocked(uid); updateRestrictionRulesForUidLocked(uid);
writePolicyLocked(); 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 { private class NetworkPolicyManagerInternalImpl extends NetworkPolicyManagerInternal {
@Override @Override