Merge "Revert "Allow package verifier to hide specific fgs notifications."" (f502b885) · Commits · e / os / android_frameworks_base

core/java/android/app/ContextImpl.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -186,16 +186,6 @@ class ContextImpl extends Context {
		private static final String XATTR_INODE_CACHE = "user.inode_cache";
		private static final String XATTR_INODE_CODE_CACHE = "user.inode_code_cache";

		/**
		* Special intent extra that critical system apps can use to hide the notification for a
		* foreground service. This extra should be placed in the intent passed into {@link
		* #startForegroundService(Intent)}.
		*
		* @hide
		*/
		private static final String EXTRA_HIDDEN_FOREGROUND_SERVICE =
		"android.intent.extra.HIDDEN_FOREGROUND_SERVICE";

		/**
		* Map from package name, to preference name, to cached preferences.
		*/
		@@ -1717,12 +1707,9 @@ class ContextImpl extends Context {
		try {
		validateServiceIntent(service);
		service.prepareToLeaveProcess(this);
		final boolean hideForegroundNotification = requireForeground
		&& service.getBooleanExtra(EXTRA_HIDDEN_FOREGROUND_SERVICE, false);
		ComponentName cn = ActivityManager.getService().startService(
		mMainThread.getApplicationThread(), service,
		service.resolveTypeIfNeeded(getContentResolver()), requireForeground,
		hideForegroundNotification,
		getOpPackageName(), getAttributionTag(), user.getIdentifier());
		if (cn != null) {
		if (cn.getPackageName().equals("!")) {

core/java/android/app/IActivityManager.aidl

+1 −2

Original line number	Diff line number	Diff line
		@@ -156,8 +156,7 @@ interface IActivityManager {
		boolean refContentProvider(in IBinder connection, int stableDelta, int unstableDelta);
		PendingIntent getRunningServiceControlPanel(in ComponentName service);
		ComponentName startService(in IApplicationThread caller, in Intent service,
		in String resolvedType, boolean requireForeground,
		boolean hideForegroundNotification, in String callingPackage,
		in String resolvedType, boolean requireForeground, in String callingPackage,
		in String callingFeatureId, int userId);
		@UnsupportedAppUsage
		int stopService(in IApplicationThread caller, in Intent service,

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

+4 −5

Original line number	Diff line number	Diff line
		@@ -478,15 +478,15 @@ public final class ActiveServices {
		}

		ComponentName startServiceLocked(IApplicationThread caller, Intent service, String resolvedType,
		int callingPid, int callingUid, boolean fgRequired, boolean hideFgNotification,
		String callingPackage, @Nullable String callingFeatureId, final int userId)
		int callingPid, int callingUid, boolean fgRequired, String callingPackage,
		@Nullable String callingFeatureId, final int userId)
		throws TransactionTooLargeException {
		return startServiceLocked(caller, service, resolvedType, callingPid, callingUid, fgRequired,
		hideFgNotification, callingPackage, callingFeatureId, userId, false, null);
		callingPackage, callingFeatureId, userId, false, null);
		}

		ComponentName startServiceLocked(IApplicationThread caller, Intent service, String resolvedType,
		int callingPid, int callingUid, boolean fgRequired, boolean hideFgNotification,
		int callingPid, int callingUid, boolean fgRequired,
		String callingPackage, @Nullable String callingFeatureId, final int userId,
		boolean allowBackgroundActivityStarts, @Nullable IBinder backgroundActivityStartsToken)
		throws TransactionTooLargeException {
		@@ -653,7 +653,6 @@ public final class ActiveServices {
		r.startRequested = true;
		r.delayedStop = false;
		r.fgRequired = fgRequired;
		r.hideFgNotification = hideFgNotification;
		r.pendingStarts.add(new ServiceRecord.StartItem(r, false, r.makeNextStartId(),
		service, neededGrants, callingUid));

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

+5 −31

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

		final Injector mInjector;

		/** The package verifier app. */
		private String mPackageVerifier;
		private int mPackageVerifierUid = UserHandle.USER_NULL;

		static final class ProcessChangeItem {
		static final int CHANGE_ACTIVITIES = 1<<0;
		static final int CHANGE_FOREGROUND_SERVICES = 1<<1;
		@@ -1809,18 +1805,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		if (phase == PHASE_SYSTEM_SERVICES_READY) {
		mService.mBatteryStatsService.systemServicesReady();
		mService.mServices.systemServicesReady();
		mService.mPackageVerifier = ArrayUtils.firstOrNull(
		LocalServices.getService(PackageManagerInternal.class).getKnownPackageNames(
		PackageManagerInternal.PACKAGE_VERIFIER, UserHandle.USER_SYSTEM));
		if (mService.mPackageVerifier != null) {
		try {
		mService.mPackageVerifierUid =
		getContext().getPackageManager().getPackageUid(
		mService.mPackageVerifier, UserHandle.USER_SYSTEM);
		} catch (NameNotFoundException e) {
		Slog.wtf(TAG, "Package manager couldn't get package verifier uid", e);
		}
		}
		} else if (phase == PHASE_ACTIVITY_MANAGER_READY) {
		mService.startBroadcastObservers();
		} else if (phase == PHASE_THIRD_PARTY_APPS_CAN_START) {
		@@ -12359,8 +12343,8 @@ public class ActivityManagerService extends IActivityManager.Stub

		@Override
		public ComponentName startService(IApplicationThread caller, Intent service,
		String resolvedType, boolean requireForeground, boolean hideForegroundNotification,
		String callingPackage, String callingFeatureId, int userId)
		String resolvedType, boolean requireForeground, String callingPackage,
		String callingFeatureId, int userId)
		throws TransactionTooLargeException {
		enforceNotIsolatedCaller("startService");
		// Refuse possible leaked file descriptors
		@@ -12372,27 +12356,17 @@ public class ActivityManagerService extends IActivityManager.Stub
		throw new IllegalArgumentException("callingPackage cannot be null");
		}

		final int callingUid = Binder.getCallingUid();
		if (requireForeground && hideForegroundNotification) {
		if (!UserHandle.isSameApp(callingUid, mPackageVerifierUid)
		\|\| !callingPackage.equals(mPackageVerifier)) {
		throw new IllegalArgumentException(
		"Only the package verifier can hide its foreground service notification");
		}
		Slog.i(TAG, "Foreground service notification hiding requested by " + callingPackage);
		}

		if (DEBUG_SERVICE) Slog.v(TAG_SERVICE,
		"*** startService: " + service + " type=" + resolvedType + " fg=" + requireForeground);
		synchronized(this) {
		final int callingPid = Binder.getCallingPid();
		final int callingUid = Binder.getCallingUid();
		final long origId = Binder.clearCallingIdentity();
		ComponentName res;
		try {
		res = mServices.startServiceLocked(caller, service,
		resolvedType, callingPid, callingUid,
		requireForeground, hideForegroundNotification,
		callingPackage, callingFeatureId, userId);
		requireForeground, callingPackage, callingFeatureId, userId);
		} finally {
		Binder.restoreCallingIdentity(origId);
		}
		@@ -16305,7 +16279,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		ComponentName res;
		try {
		res = mServices.startServiceLocked(null, service,
		resolvedType, -1, uid, fgRequired, false, callingPackage,
		resolvedType, -1, uid, fgRequired, callingPackage,
		callingFeatureId, userId, allowBackgroundActivityStarts,
		backgroundActivityStartsToken);
		} finally {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -655,7 +655,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
		pw.println("Starting service: " + intent);
		pw.flush();
		ComponentName cn = mInterface.startService(null, intent, intent.getType(),
		asForeground, false, SHELL_PACKAGE_NAME, null, mUserId);
		asForeground, SHELL_PACKAGE_NAME, null, mUserId);
		if (cn == null) {
		err.println("Error: Not found; no service started.");
		return -1;