Merge "Revert "Add isUidActiveOrForeground() for camera/audio to use."" into rvc-dev am: a6099ac785 (62adb8e4) · Commits · e / os / android_frameworks_base

core/java/android/app/IActivityManager.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,6 @@ interface IActivityManager {
		void unregisterUidObserver(in IUidObserver observer);
		boolean isUidActive(int uid, String callingPackage);
		int getUidProcessState(int uid, in String callingPackage);
		boolean isUidActiveOrForeground(int uid, String callingPackage);
		// =============== End of transactions used on native side as well ============================

		// Special low-level communication with activity manager.

+0 −21

Original line number	Diff line number	Diff line
		@@ -8765,27 +8765,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		return uidRecord != null && !uidRecord.setIdle;
		}

		@Override
		public boolean isUidActiveOrForeground(int uid, String callingPackage) {
		if (!hasUsageStatsPermission(callingPackage)) {
		enforceCallingPermission(android.Manifest.permission.PACKAGE_USAGE_STATS,
		"isUidActiveOrForeground");
		}
		synchronized (this) {
		final boolean isActive = isUidActiveLocked(uid);
		if (isActive) {
		return true;
		}
		}
		final boolean isForeground = mAtmInternal.isUidForeground(uid);
		if (isForeground) {
		Slog.wtf(TAG, "isUidActiveOrForeground: isUidActive false but "
		+ " isUidForeground true, uid:" + uid
		+ " callingPackage:" + callingPackage);
		}
		return isForeground;
		}

		@Override
		public void setPersistentVrThread(int tid) {
		mActivityTaskManager.setPersistentVrThread(tid);