Merge cherrypicks of [14058164, 14058348, 14058350, 14057874, 14058351,... (8aac5aee) · Commits · e / os / android_frameworks_base

apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -640,7 +640,7 @@ public class AppSearchManagerService extends SystemService {

		@Override
		public void persistToDisk(@UserIdInt int userId) {
		int callingUid = Binder.getCallingUidOrThrow();
		int callingUid = Binder.getCallingUid();
		int callingUserId = handleIncomingUser(userId, callingUid);
		final long callingIdentity = Binder.clearCallingIdentity();
		try {

apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java

+34 −25

Original line number	Diff line number	Diff line
		@@ -188,11 +188,8 @@ public final class ConnectivityController extends RestrictingController implemen
		@Override
		public void maybeStartTrackingJobLocked(JobStatus jobStatus, JobStatus lastJob) {
		if (jobStatus.hasConnectivityConstraint()) {
		UidStats uidStats = mUidStats.get(jobStatus.getSourceUid());
		if (uidStats == null) {
		uidStats = new UidStats(jobStatus.getSourceUid());
		mUidStats.append(jobStatus.getSourceUid(), uidStats);
		}
		final UidStats uidStats =
		getUidStats(jobStatus.getSourceUid(), jobStatus.getSourcePackageName(), false);
		if (wouldBeReadyWithConstraintLocked(jobStatus, JobStatus.CONSTRAINT_CONNECTIVITY)) {
		uidStats.numReadyWithConnectivity++;
		}
		@@ -211,7 +208,8 @@ public final class ConnectivityController extends RestrictingController implemen
		@Override
		public void prepareForExecutionLocked(JobStatus jobStatus) {
		if (jobStatus.hasConnectivityConstraint()) {
		UidStats uidStats = mUidStats.get(jobStatus.getSourceUid());
		final UidStats uidStats =
		getUidStats(jobStatus.getSourceUid(), jobStatus.getSourcePackageName(), true);
		uidStats.numRunning++;
		}
		}
		@@ -225,23 +223,11 @@ public final class ConnectivityController extends RestrictingController implemen
		if (jobs != null) {
		jobs.remove(jobStatus);
		}
		UidStats us = mUidStats.get(jobStatus.getSourceUid());
		if (us == null) {
		// This shouldn't be happening. We create a UidStats object for the app when the
		// first job is scheduled in maybeStartTrackingJobLocked() and only ever drop the
		// object if the app is uninstalled or the user is removed. That means that if we
		// end up in this situation, onAppRemovedLocked() or onUserRemovedLocked() was
		// called before maybeStopTrackingJobLocked(), which is the reverse order of what
		// JobSchedulerService does (JSS calls maybeStopTrackingJobLocked() for all jobs
		// before calling onAppRemovedLocked() or onUserRemovedLocked()).
		Slog.wtfStack(TAG,
		"UidStats was null after job for " + jobStatus.getSourcePackageName()
		+ " was registered");
		} else {
		us.numReadyWithConnectivity--;
		final UidStats uidStats =
		getUidStats(jobStatus.getSourceUid(), jobStatus.getSourcePackageName(), true);
		uidStats.numReadyWithConnectivity--;
		if (jobStatus.madeActive != 0) {
		us.numRunning--;
		}
		uidStats.numRunning--;
		}
		maybeRevokeStandbyExceptionLocked(jobStatus);
		maybeAdjustRegisteredCallbacksLocked();
		@@ -266,6 +252,27 @@ public final class ConnectivityController extends RestrictingController implemen
		}
		}

		@NonNull
		private UidStats getUidStats(int uid, String packageName, boolean shouldExist) {
		UidStats us = mUidStats.get(uid);
		if (us == null) {
		if (shouldExist) {
		// This shouldn't be happening. We create a UidStats object for the app when the
		// first job is scheduled in maybeStartTrackingJobLocked() and only ever drop the
		// object if the app is uninstalled or the user is removed. That means that if we
		// end up in this situation, onAppRemovedLocked() or onUserRemovedLocked() was
		// called before maybeStopTrackingJobLocked(), which is the reverse order of what
		// JobSchedulerService does (JSS calls maybeStopTrackingJobLocked() for all jobs
		// before calling onAppRemovedLocked() or onUserRemovedLocked()).
		Slog.wtfStack(TAG,
		"UidStats was null after job for " + packageName + " was registered");
		}
		us = new UidStats(uid);
		mUidStats.append(uid, us);
		}
		return us;
		}

		/**
		* Returns true if the job's requested network is available. This DOES NOT necessarily mean
		* that the UID has been granted access to the network.
		@@ -332,7 +339,8 @@ public final class ConnectivityController extends RestrictingController implemen
		return;
		}

		UidStats uidStats = mUidStats.get(jobStatus.getSourceUid());
		final UidStats uidStats =
		getUidStats(jobStatus.getSourceUid(), jobStatus.getSourcePackageName(), true);

		if (jobStatus.shouldTreatAsExpeditedJob()) {
		if (!jobStatus.isConstraintSatisfied(JobStatus.CONSTRAINT_CONNECTIVITY)) {
		@@ -584,7 +592,8 @@ public final class ConnectivityController extends RestrictingController implemen
		if (mCurrentDefaultNetworkCallbacks.contains(sourceUid)) {
		return;
		}
		UidStats uidStats = mUidStats.get(sourceUid);
		final UidStats uidStats =
		getUidStats(jobStatus.getSourceUid(), jobStatus.getSourcePackageName(), true);
		if (!mSortedStats.contains(uidStats)) {
		mSortedStats.add(uidStats);
		}

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -10684,7 +10684,7 @@ package android.content {
		ctor public ContextParams.Builder(@NonNull android.content.ContextParams);
		method @NonNull public android.content.ContextParams build();
		method @NonNull public android.content.ContextParams.Builder setAttributionTag(@Nullable String);
		method @NonNull public android.content.ContextParams.Builder setNextAttributionSource(@NonNull android.content.AttributionSource);
		method @NonNull public android.content.ContextParams.Builder setNextAttributionSource(@Nullable android.content.AttributionSource);
		}

		public class ContextWrapper extends android.content.Context {

core/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -2315,7 +2315,7 @@ package android.content {
		}

		public static final class ContextParams.Builder {
		method @NonNull @RequiresPermission(android.Manifest.permission.RENOUNCE_PERMISSIONS) public android.content.ContextParams.Builder setRenouncedPermissions(@NonNull java.util.Set<java.lang.String>);
		method @NonNull @RequiresPermission(android.Manifest.permission.RENOUNCE_PERMISSIONS) public android.content.ContextParams.Builder setRenouncedPermissions(@Nullable java.util.Set<java.lang.String>);
		}

		public class ContextWrapper extends android.content.Context {

core/java/android/app/AppOpsManager.java

+26 −0

Original line number	Diff line number	Diff line
		@@ -7403,6 +7403,32 @@ public class AppOpsManager {
		return sOpToString[opCode];
		}

		/**
		* Resolves special UID's pakcages such as root, shell, media, etc.
		*
		* @param uid The uid to resolve.
		* @param packageName Optional package. If caller system and null returns "android"
		* @return The resolved package name.
		*
		* @hide
		*/
		public static @Nullable String resolvePackageName(int uid, @Nullable String packageName) {
		if (uid == Process.ROOT_UID) {
		return "root";
		} else if (uid == Process.SHELL_UID) {
		return "com.android.shell";
		} else if (uid == Process.MEDIA_UID) {
		return "media";
		} else if (uid == Process.AUDIOSERVER_UID) {
		return "audioserver";
		} else if (uid == Process.CAMERASERVER_UID) {
		return "cameraserver";
		} else if (uid == Process.SYSTEM_UID && packageName == null) {
		return "android";
		}
		return packageName;
		}

		/**
		* Monitor for changes to the operating mode for the given op in the given app package.
		* You can watch op changes only for your UID.