Merge "Speed up NetworkPolicy thread during user creation" into rvc-dev am:... (45fe45b1) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+24 −2

Original line number	Original line	Diff line number	Diff line
	@@ -90,6 +90,7 @@ import android.os.Process;
	import android.os.RemoteException;		import android.os.RemoteException;
	import android.os.ServiceManager;		import android.os.ServiceManager;
	import android.os.SystemClock;		import android.os.SystemClock;
			import android.os.Trace;
	import android.os.UserHandle;		import android.os.UserHandle;
	import android.provider.Settings.Global;		import android.provider.Settings.Global;
	import android.telephony.TelephonyManager;		import android.telephony.TelephonyManager;
	@@ -241,6 +242,14 @@ public class AppStandbyController implements AppStandbyInternal {

	private final CountDownLatch mAdminDataAvailableLatch = new CountDownLatch(1);		private final CountDownLatch mAdminDataAvailableLatch = new CountDownLatch(1);

			// Cache the active network scorer queried from the network scorer service
			private volatile String mCachedNetworkScorer = null;
			// The last time the network scorer service was queried
			private volatile long mCachedNetworkScorerAtMillis = 0L;
			// How long before querying the network scorer again. During this time, subsequent queries will
			// get the cached value
			private static final long NETWORK_SCORER_CACHE_DURATION_MILLIS = 5000L;

	// Messages for the handler		// Messages for the handler
	static final int MSG_INFORM_LISTENERS = 3;		static final int MSG_INFORM_LISTENERS = 3;
	static final int MSG_FORCE_IDLE_STATE = 4;		static final int MSG_FORCE_IDLE_STATE = 4;
	@@ -1160,6 +1169,8 @@ public class AppStandbyController implements AppStandbyInternal {
	return new int[0];		return new int[0];
	}		}

			Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "getIdleUidsForUser");

	final long elapsedRealtime = mInjector.elapsedRealtime();		final long elapsedRealtime = mInjector.elapsedRealtime();

	List<ApplicationInfo> apps;		List<ApplicationInfo> apps;
	@@ -1195,6 +1206,7 @@ public class AppStandbyController implements AppStandbyInternal {
	uidStates.setValueAt(index, value + 1 + (idle ? 1<<16 : 0));		uidStates.setValueAt(index, value + 1 + (idle ? 1<<16 : 0));
	}		}
	}		}

	if (DEBUG) {		if (DEBUG) {
	Slog.d(TAG, "getIdleUids took " + (mInjector.elapsedRealtime() - elapsedRealtime));		Slog.d(TAG, "getIdleUids took " + (mInjector.elapsedRealtime() - elapsedRealtime));
	}		}
	@@ -1216,6 +1228,8 @@ public class AppStandbyController implements AppStandbyInternal {
	}		}
	}		}

			Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

	return res;		return res;
	}		}

	@@ -1582,8 +1596,16 @@ public class AppStandbyController implements AppStandbyInternal {
	}		}

	private boolean isActiveNetworkScorer(String packageName) {		private boolean isActiveNetworkScorer(String packageName) {
	String activeScorer = mInjector.getActiveNetworkScorer();		// Validity of network scorer cache is limited to a few seconds. Fetch it again
	return packageName != null && packageName.equals(activeScorer);		// if longer since query.
			// This is a temporary optimization until there's a callback mechanism for changes to network scorer.
			final long now = SystemClock.elapsedRealtime();
			if (mCachedNetworkScorer == null
			\|\| mCachedNetworkScorerAtMillis < now - NETWORK_SCORER_CACHE_DURATION_MILLIS) {
			mCachedNetworkScorer = mInjector.getActiveNetworkScorer();
			mCachedNetworkScorerAtMillis = now;
			}
			return packageName != null && packageName.equals(mCachedNetworkScorer);
	}		}

	private void informListeners(String packageName, int userId, int bucket, int reason,		private void informListeners(String packageName, int userId, int bucket, int reason,

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

+37 −17

Original line number	Original line	Diff line number	Diff line
	@@ -578,6 +578,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

	private final NetworkPolicyLogger mLogger = new NetworkPolicyLogger();		private final NetworkPolicyLogger mLogger = new NetworkPolicyLogger();

			/** List of apps indexed by appId and whether they have the internet permission */
			@GuardedBy("mUidRulesFirstLock")
			private final SparseBooleanArray mInternetPermissionMap = new SparseBooleanArray();

	// TODO: keep whitelist of system-critical services that should never have		// TODO: keep whitelist of system-critical services that should never have
	// rules enforced, such as system, phone, and radio UIDs.		// rules enforced, such as system, phone, and radio UIDs.

	@@ -958,7 +962,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	// update rules for UID, since it might be subject to		// update rules for UID, since it might be subject to
	// global background data policy		// global background data policy
	if (LOGV) Slog.v(TAG, "ACTION_PACKAGE_ADDED for uid=" + uid);		if (LOGV) Slog.v(TAG, "ACTION_PACKAGE_ADDED for uid=" + uid);
			// Clear the cache for the app
	synchronized (mUidRulesFirstLock) {		synchronized (mUidRulesFirstLock) {
			mInternetPermissionMap.delete(UserHandle.getAppId(uid));
	updateRestrictionRulesForUidUL(uid);		updateRestrictionRulesForUidUL(uid);
	}		}
	}		}
	@@ -1000,7 +1006,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	synchronized (mUidRulesFirstLock) {		synchronized (mUidRulesFirstLock) {
	// Remove any persistable state for the given user; both cleaning up after a		// Remove any persistable state for the given user; both cleaning up after a
	// USER_REMOVED, and one last sanity check during USER_ADDED		// USER_REMOVED, and one last sanity check during USER_ADDED
	removeUserStateUL(userId, true);		removeUserStateUL(userId, true, false);
	// Removing outside removeUserStateUL since that can also be called when		// Removing outside removeUserStateUL since that can also be called when
	// user resets app preferences.		// user resets app preferences.
	mMeteredRestrictedUids.remove(userId);		mMeteredRestrictedUids.remove(userId);
	@@ -2613,7 +2619,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	setUidPolicyUncheckedUL(uid, policy, false);		setUidPolicyUncheckedUL(uid, policy, false);

	final boolean notifyApp;		final boolean notifyApp;
	if (!isUidValidForWhitelistRules(uid)) {		if (!isUidValidForWhitelistRulesUL(uid)) {
	notifyApp = false;		notifyApp = false;
	} else {		} else {
	final boolean wasBlacklisted = oldPolicy == POLICY_REJECT_METERED_BACKGROUND;		final boolean wasBlacklisted = oldPolicy == POLICY_REJECT_METERED_BACKGROUND;
	@@ -2689,7 +2695,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	* if any changes that are made.		* if any changes that are made.
	*/		*/
	@GuardedBy("mUidRulesFirstLock")		@GuardedBy("mUidRulesFirstLock")
	boolean removeUserStateUL(int userId, boolean writePolicy) {		boolean removeUserStateUL(int userId, boolean writePolicy, boolean updateGlobalRules) {

	mLogger.removingUserState(userId);		mLogger.removingUserState(userId);
	boolean changed = false;		boolean changed = false;
	@@ -2719,7 +2725,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	changed = true;		changed = true;
	}		}
	synchronized (mNetworkPoliciesSecondLock) {		synchronized (mNetworkPoliciesSecondLock) {
			if (updateGlobalRules) {
	updateRulesForGlobalChangeAL(true);		updateRulesForGlobalChangeAL(true);
			}
	if (writePolicy && changed) {		if (writePolicy && changed) {
	writePolicyAL();		writePolicyAL();
	}		}
	@@ -3859,7 +3867,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	// quick check: if this uid doesn't have INTERNET permission, it		// quick check: if this uid doesn't have INTERNET permission, it
	// doesn't have network access anyway, so it is a waste to mess		// doesn't have network access anyway, so it is a waste to mess
	// with it here.		// with it here.
	if (hasInternetPermissions(uid)) {		if (hasInternetPermissionUL(uid)) {
	uidRules.put(uid, FIREWALL_RULE_DENY);		uidRules.put(uid, FIREWALL_RULE_DENY);
	}		}
	}		}
	@@ -3874,7 +3882,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

	@GuardedBy("mUidRulesFirstLock")		@GuardedBy("mUidRulesFirstLock")
	void updateRuleForAppIdleUL(int uid) {		void updateRuleForAppIdleUL(int uid) {
	if (!isUidValidForBlacklistRules(uid)) return;		if (!isUidValidForBlacklistRulesUL(uid)) return;

	if (Trace.isTagEnabled(Trace.TRACE_TAG_NETWORK)) {		if (Trace.isTagEnabled(Trace.TRACE_TAG_NETWORK)) {
	Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "updateRuleForAppIdleUL: " + uid );		Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "updateRuleForAppIdleUL: " + uid );
	@@ -4056,18 +4064,20 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

	// TODO: the MEDIA / DRM restriction might not be needed anymore, in which case both		// TODO: the MEDIA / DRM restriction might not be needed anymore, in which case both
	// methods below could be merged into a isUidValidForRules() method.		// methods below could be merged into a isUidValidForRules() method.
	private boolean isUidValidForBlacklistRules(int uid) {		@GuardedBy("mUidRulesFirstLock")
			private boolean isUidValidForBlacklistRulesUL(int uid) {
	// allow rules on specific system services, and any apps		// allow rules on specific system services, and any apps
	if (uid == android.os.Process.MEDIA_UID \|\| uid == android.os.Process.DRM_UID		if (uid == android.os.Process.MEDIA_UID \|\| uid == android.os.Process.DRM_UID
	\|\| (UserHandle.isApp(uid) && hasInternetPermissions(uid))) {		\|\| isUidValidForWhitelistRulesUL(uid)) {
	return true;		return true;
	}		}

	return false;		return false;
	}		}

	private boolean isUidValidForWhitelistRules(int uid) {		@GuardedBy("mUidRulesFirstLock")
	return UserHandle.isApp(uid) && hasInternetPermissions(uid);		private boolean isUidValidForWhitelistRulesUL(int uid) {
			return UserHandle.isApp(uid) && hasInternetPermissionUL(uid);
	}		}

	/**		/**
	@@ -4143,12 +4153,20 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	* <p>		* <p>
	* Useful for the cases where the lack of network access can simplify the rules.		* Useful for the cases where the lack of network access can simplify the rules.
	*/		*/
	private boolean hasInternetPermissions(int uid) {		@GuardedBy("mUidRulesFirstLock")
			private boolean hasInternetPermissionUL(int uid) {
	try {		try {
	if (mIPm.checkUidPermission(Manifest.permission.INTERNET, uid)		final int appId = UserHandle.getAppId(uid);
	!= PackageManager.PERMISSION_GRANTED) {		final boolean hasPermission;
	return false;		if (mInternetPermissionMap.indexOfKey(appId) < 0) {
			hasPermission =
			mIPm.checkUidPermission(Manifest.permission.INTERNET, uid)
			== PackageManager.PERMISSION_GRANTED;
			mInternetPermissionMap.put(appId, hasPermission);
			} else {
			hasPermission = mInternetPermissionMap.get(appId);
	}		}
			return hasPermission;
	} catch (RemoteException e) {		} catch (RemoteException e) {
	}		}
	return true;		return true;
	@@ -4253,7 +4271,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	}		}

	private void updateRulesForDataUsageRestrictionsULInner(int uid) {		private void updateRulesForDataUsageRestrictionsULInner(int uid) {
	if (!isUidValidForWhitelistRules(uid)) {		if (!isUidValidForWhitelistRulesUL(uid)) {
	if (LOGD) Slog.d(TAG, "no need to update restrict data rules for uid " + uid);		if (LOGD) Slog.d(TAG, "no need to update restrict data rules for uid " + uid);
	return;		return;
	}		}
	@@ -4400,6 +4418,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	*		*
	* @return the new computed rules for the uid		* @return the new computed rules for the uid
	*/		*/
			@GuardedBy("mUidRulesFirstLock")
	private int updateRulesForPowerRestrictionsUL(int uid, int oldUidRules, boolean paroled) {		private int updateRulesForPowerRestrictionsUL(int uid, int oldUidRules, boolean paroled) {
	if (Trace.isTagEnabled(Trace.TRACE_TAG_NETWORK)) {		if (Trace.isTagEnabled(Trace.TRACE_TAG_NETWORK)) {
	Trace.traceBegin(Trace.TRACE_TAG_NETWORK,		Trace.traceBegin(Trace.TRACE_TAG_NETWORK,
	@@ -4413,8 +4432,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	}		}
	}		}

			@GuardedBy("mUidRulesFirstLock")
	private int updateRulesForPowerRestrictionsULInner(int uid, int oldUidRules, boolean paroled) {		private int updateRulesForPowerRestrictionsULInner(int uid, int oldUidRules, boolean paroled) {
	if (!isUidValidForBlacklistRules(uid)) {		if (!isUidValidForBlacklistRulesUL(uid)) {
	if (LOGD) Slog.d(TAG, "no need to update restrict power rules for uid " + uid);		if (LOGD) Slog.d(TAG, "no need to update restrict power rules for uid " + uid);
	return RULE_NONE;		return RULE_NONE;
	}		}
	@@ -5198,7 +5218,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	@Override		@Override
	public void resetUserState(int userId) {		public void resetUserState(int userId) {
	synchronized (mUidRulesFirstLock) {		synchronized (mUidRulesFirstLock) {
	boolean changed = removeUserStateUL(userId, false);		boolean changed = removeUserStateUL(userId, false, true);
	changed = addDefaultRestrictBackgroundWhitelistUidsUL(userId) \|\| changed;		changed = addDefaultRestrictBackgroundWhitelistUidsUL(userId) \|\| changed;
	if (changed) {		if (changed) {
	synchronized (mNetworkPoliciesSecondLock) {		synchronized (mNetworkPoliciesSecondLock) {