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

Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-21 02:46:05 +00:00
committed by Android (Google) Code Review
parent 32ae78598d f1da90fe04
commit 1bae4e3e17
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

@@ -166,7 +166,6 @@ import android.util.Xml;
import com.android.internal.R; import com.android.internal.R;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
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;
@@ -407,7 +406,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;
@@ -449,8 +447,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());
@@ -582,8 +578,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 (mUidRulesFirstLock) { synchronized (mUidRulesFirstLock) {
synchronized (mNetworkPoliciesSecondLock) { synchronized (mNetworkPoliciesSecondLock) {
updatePowerSaveWhitelistUL(); updatePowerSaveWhitelistUL();
@@ -765,6 +759,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 (mUidRulesFirstLock) { synchronized (mUidRulesFirstLock) {
mUidPolicy.delete(uid); mUidPolicy.delete(uid);
removeRestrictBackgroundWhitelistedUidUL(uid, true, true);
updateRestrictionRulesForUidUL(uid); updateRestrictionRulesForUidUL(uid);
synchronized (mNetworkPoliciesSecondLock) { synchronized (mNetworkPoliciesSecondLock) {
writePolicyAL(); 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 { private class NetworkPolicyManagerInternalImpl extends NetworkPolicyManagerInternal {
@Override @Override