Merge "Allow FGS started from MediaButtonReceiver to have while-in-use... (51def1dc) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManagerInternal.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -440,4 +440,11 @@ public abstract class ActivityManagerInternal {
		* @return true if exists, false otherwise.
		*/
		public abstract boolean isPendingTopUid(int uid);

		public abstract void tempAllowWhileInUsePermissionInFgs(int uid, long duration);

		public abstract boolean isTempAllowlistedForFgsWhileInUse(int uid);

		public abstract boolean canAllowWhileInUsePermissionInFgs(int pid, int uid,
		@NonNull String packageName);
		}

services/core/java/com/android/server/am/ActiveServices.java

+18 −5

Original line number	Diff line number	Diff line
		@@ -4878,18 +4878,21 @@ public final class ActiveServices {
		return true;
		}

		if (r.app != null) {
		if (r != null && r.app != null) {
		ActiveInstrumentation instr = r.app.getActiveInstrumentation();
		if (instr != null && instr.mHasBackgroundActivityStartsPermission) {
		return true;
		}
		}

		final boolean hasAllowBackgroundActivityStartsToken = r.app != null
		? !r.app.mAllowBackgroundActivityStartsTokens.isEmpty() : false;
		if (hasAllowBackgroundActivityStartsToken) {
		for (int i = mAm.mProcessList.mLruProcesses.size() - 1; i >= 0; i--) {
		final ProcessRecord pr = mAm.mProcessList.mLruProcesses.get(i);
		if (pr.uid == callingUid) {
		if (!pr.mAllowBackgroundActivityStartsTokens.isEmpty()) {
		return true;
		}
		}
		}

		if (mAm.checkPermission(START_ACTIVITIES_FROM_BACKGROUND, callingPid, callingUid)
		== PERMISSION_GRANTED) {
		@@ -4907,6 +4910,10 @@ public final class ActiveServices {
		return true;
		}

		if (mAm.mInternal.isTempAllowlistedForFgsWhileInUse(callingUid)) {
		return true;
		}

		final boolean isWhiteListedPackage =
		mWhiteListAllowWhileInUsePermissionInFgs.contains(callingPackage);
		if (isWhiteListedPackage) {
		@@ -4920,4 +4927,10 @@ public final class ActiveServices {
		}
		return false;
		}

		boolean canAllowWhileInUsePermissionInFgsLocked(int callingPid, int callingUid,
		String callingPackage) {
		return shouldAllowWhileInUsePermissionInFgsLocked(
		callingPackage, callingPid, callingUid, null, null, false);
		}
		}

services/core/java/com/android/server/am/ActivityManagerService.java

+25 −0

Original line number	Diff line number	Diff line
		@@ -1265,6 +1265,13 @@ public class ActivityManagerService extends IActivityManager.Stub

		final PendingTempWhitelists mPendingTempWhitelist = new PendingTempWhitelists(this);

		/**
		* List of uids that are allowed to have while-in-use permission when FGS is started from
		* background.
		*/
		private final FgsWhileInUseTempAllowList mFgsWhileInUseTempAllowList =
		new FgsWhileInUseTempAllowList();

		/**
		* Information about and control over application operations
		*/
		@@ -19945,6 +19952,24 @@ public class ActivityManagerService extends IActivityManager.Stub
		public boolean isPendingTopUid(int uid) {
		return mPendingStartActivityUids.isPendingTopUid(uid);
		}

		@Override
		public void tempAllowWhileInUsePermissionInFgs(int uid, long duration) {
		mFgsWhileInUseTempAllowList.add(uid, duration);
		}

		@Override
		public boolean isTempAllowlistedForFgsWhileInUse(int uid) {
		return mFgsWhileInUseTempAllowList.isAllowed(uid);
		}

		@Override
		public boolean canAllowWhileInUsePermissionInFgs(int pid, int uid,
		@NonNull String packageName) {
		synchronized (ActivityManagerService.this) {
		return mServices.canAllowWhileInUsePermissionInFgsLocked(pid, uid, packageName);
		}
		}
		}

		long inputDispatchingTimedOut(int pid, final boolean aboveSystem, String reason) {

services/core/java/com/android/server/am/FgsWhileInUseTempAllowList.java

0 → 100644

+82 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.am;

		import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;

		import android.os.SystemClock;
		import android.util.Slog;
		import android.util.SparseLongArray;

		/**
		* List of uids that are allowed to have while-in-use permission when FGS is started
		* from background.
		*/
		final class FgsWhileInUseTempAllowList {
		/**
		* This list is supposed to have a small number of entries. If exceeds MAX_SIZE, log a warning
		* message.
		*/
		private static final int MAX_SIZE = 100;
		/**
		* The key is the UID, the value is expiration elapse time in ms of this temp-allowed UID.
		*/
		private final SparseLongArray mTempAllowListFgs = new SparseLongArray();

		private final Object mLock = new Object();

		void add(int uid, long durationMs) {
		synchronized (mLock) {
		if (durationMs <= 0) {
		Slog.e(TAG_AM, "FgsWhileInUseTempAllowList bad duration:" + durationMs
		+ " uid: " + uid);
		return;
		}
		// The temp allowlist should be a short list with only a few entries in it.
		final int size = mTempAllowListFgs.size();
		if (size > MAX_SIZE) {
		Slog.w(TAG_AM, "FgsWhileInUseTempAllowList length:" + size + " exceeds "
		+ MAX_SIZE);
		}
		final long now = SystemClock.elapsedRealtime();
		for (int index = mTempAllowListFgs.size() - 1; index >= 0; index--) {
		if (mTempAllowListFgs.valueAt(index) < now) {
		mTempAllowListFgs.removeAt(index);
		}
		}
		final long existingExpirationTime = mTempAllowListFgs.get(uid, -1);
		final long expirationTime = now + durationMs;
		if (existingExpirationTime == -1 \|\| existingExpirationTime < expirationTime) {
		mTempAllowListFgs.put(uid, expirationTime);
		}
		}
		}

		boolean isAllowed(int uid) {
		synchronized (mLock) {
		final int index = mTempAllowListFgs.indexOfKey(uid);
		if (index < 0) {
		return false;
		} else if (mTempAllowListFgs.valueAt(index) < SystemClock.elapsedRealtime()) {
		mTempAllowListFgs.removeAt(index);
		return false;
		} else {
		return true;
		}
		}
		}
		}

services/core/java/com/android/server/appop/AppOpsService.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -583,6 +583,10 @@ public class AppOpsService extends IAppOpsService.Stub {
		if (mActivityManagerInternal != null
		&& mActivityManagerInternal.isPendingTopUid(uid)) {
		return MODE_ALLOWED;
		} else if (mActivityManagerInternal != null
		&& mActivityManagerInternal.isTempAllowlistedForFgsWhileInUse(
		uid)) {
		return MODE_ALLOWED;
		} else if ((capability & PROCESS_CAPABILITY_FOREGROUND_CAMERA) != 0) {
		return MODE_ALLOWED;
		} else {
		@@ -592,6 +596,10 @@ public class AppOpsService extends IAppOpsService.Stub {
		if (mActivityManagerInternal != null
		&& mActivityManagerInternal.isPendingTopUid(uid)) {
		return MODE_ALLOWED;
		} else if (mActivityManagerInternal != null
		&& mActivityManagerInternal.isTempAllowlistedForFgsWhileInUse(
		uid)) {
		return MODE_ALLOWED;
		} else if ((capability & PROCESS_CAPABILITY_FOREGROUND_MICROPHONE) != 0) {
		return MODE_ALLOWED;
		} else {