Snap for 10196038 from e792c1a8a4a3552674795f0b3a24e6e905652b52 to udc-qpr1-release (6158aae4) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+0 −28

Original line number	Diff line number	Diff line
		@@ -65,11 +65,9 @@ import android.os.UserManager;
		import android.provider.DeviceConfig;
		import android.util.ArrayMap;
		import android.util.ArraySet;
		import android.util.Log;
		import android.util.LongSparseArray;
		import android.util.LongSparseLongArray;
		import android.util.Pools;
		import android.util.Slog;
		import android.util.SparseArray;

		import com.android.internal.annotations.GuardedBy;
		@@ -182,8 +180,6 @@ import java.util.function.Supplier;
		*/
		@SystemService(Context.APP_OPS_SERVICE)
		public class AppOpsManager {
		private static final String LOG_TAG = "AppOpsManager";

		/**
		* This is a subtle behavior change to {@link #startWatchingMode}.
		*
		@@ -7542,7 +7538,6 @@ public class AppOpsManager {
		*/
		@RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)
		public void setUidMode(int code, int uid, @Mode int mode) {
		logAnySeriousModeChanges(code, uid, null, mode);
		try {
		mService.setUidMode(code, uid, mode);
		} catch (RemoteException e) {
		@@ -7563,7 +7558,6 @@ public class AppOpsManager {
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)
		public void setUidMode(@NonNull String appOp, int uid, @Mode int mode) {
		logAnySeriousModeChanges(strOpToOp(appOp), uid, null, mode);
		try {
		mService.setUidMode(AppOpsManager.strOpToOp(appOp), uid, mode);
		} catch (RemoteException e) {
		@@ -7599,32 +7593,11 @@ public class AppOpsManager {
		}
		}

		private void logAnySeriousModeChanges(int code, int uid, String packageName, @Mode int mode) {
		// TODO (b/280869337): Remove this once we have the required data.
		if (code != OP_RUN_ANY_IN_BACKGROUND \|\| mode == MODE_ALLOWED) {
		return;
		}
		final StringBuilder log = new StringBuilder("Attempt to change RUN_ANY_IN_BACKGROUND to ")
		.append(modeToName(mode))
		.append(" for uid: ")
		.append(UserHandle.formatUid(uid))
		.append(" package: ")
		.append(packageName)
		.append(" by: ")
		.append(mContext.getOpPackageName());
		if (Process.myUid() == Process.SYSTEM_UID) {
		Slog.wtfStack(LOG_TAG, log.toString());
		} else {
		Log.w(LOG_TAG, log.toString());
		}
		}

		/** @hide */
		@UnsupportedAppUsage
		@TestApi
		@RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)
		public void setMode(int code, int uid, String packageName, @Mode int mode) {
		logAnySeriousModeChanges(code, uid, packageName, mode);
		try {
		mService.setMode(code, uid, packageName, mode);
		} catch (RemoteException e) {
		@@ -7647,7 +7620,6 @@ public class AppOpsManager {
		@RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)
		public void setMode(@NonNull String op, int uid, @Nullable String packageName,
		@Mode int mode) {
		logAnySeriousModeChanges(strOpToOp(op), uid, packageName, mode);
		try {
		mService.setMode(strOpToOp(op), uid, packageName, mode);
		} catch (RemoteException e) {

core/java/android/app/Notification.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -2840,6 +2840,10 @@ public class Notification implements Parcelable
		* @hide
		*/
		public void visitUris(@NonNull Consumer<Uri> visitor) {
		if (publicVersion != null) {
		publicVersion.visitUris(visitor);
		}

		visitor.accept(sound);

		if (tickerView != null) tickerView.visitUris(visitor);

core/java/android/content/pm/TEST_MAPPING

+140 −193

Original line number	Diff line number	Diff line
		@@ -40,7 +40,9 @@
		"presubmit":[
		{
		"name":"CtsInstantAppTests",
		"file_patterns": ["(/\|^)InstantApp[^/]*"]
		"file_patterns":[
		"(/\|^)InstantApp[^/]*"
		]
		},
		{
		"name":"CarrierAppIntegrationTestCases"
		@@ -56,7 +58,9 @@
		},
		{
		"name":"CtsAppFgsTestCases",
		"file_patterns": ["(/\|^)ServiceInfo[^/]*"],
		"file_patterns":[
		"(/\|^)ServiceInfo[^/]*"
		],
		"options":[
		{
		"include-annotation":"android.platform.test.annotations.Presubmit"
		@@ -71,7 +75,9 @@
		},
		{
		"name":"CtsShortFgsTestCases",
		"file_patterns": ["(/\|^)ServiceInfo[^/]*"],
		"file_patterns":[
		"(/\|^)ServiceInfo[^/]*"
		],
		"options":[
		{
		"include-annotation":"android.platform.test.annotations.Presubmit"
		@@ -160,64 +166,5 @@
		{
		"name":"CtsInstallHostTestCases"
		}
		],
		"staged-platinum-postsubmit": [
		{
		"name": "CtsIncrementalInstallHostTestCases"
		},
		{
		"name": "CtsAppSecurityHostTestCases",
		"options": [
		{
		"include-filter": "android.appsecurity.cts.SplitTests"
		},
		{
		"include-filter": "android.appsecurity.cts.EphemeralTest"
		}
		]
		},
		{
		"name": "CtsContentTestCases",
		"options": [
		{
		"include-filter": "android.content.cts.IntentFilterTest"
		}
		]
		}
		],
		"platinum-postsubmit": [
		{
		"name": "CtsIncrementalInstallHostTestCases",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "CtsAppSecurityHostTestCases",
		"options": [
		{
		"include-filter": "android.appsecurity.cts.SplitTests"
		},
		{
		"include-filter": "android.appsecurity.cts.EphemeralTest"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "CtsContentTestCases",
		"options":[
		{
		"include-filter": "android.content.cts.IntentFilterTest"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		}
		]
		}
		No newline at end of file

core/java/android/service/voice/VoiceInteractionService.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -1066,7 +1066,9 @@ public class VoiceInteractionService extends Service {
		synchronized (mLock) {
		mActiveDetectors.forEach(detector -> {
		try {
		if (detector != mActiveVisualQueryDetector.getInitializationDelegate()
		// Skip destroying VisualQueryDetector if HotwordDetectors are created
		if (!(mActiveVisualQueryDetector != null
		&& detector == mActiveVisualQueryDetector.getInitializationDelegate())
		\|\| shouldShutDownVisualQueryDetector) {
		detector.destroy();
		}

core/java/android/view/InsetsController.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -658,6 +658,9 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
		/** Set of inset types which cannot be controlled by the user animation */
		private @InsetsType int mDisabledUserAnimationInsetsTypes;

		/** Set of inset types which are existing */
		private @InsetsType int mExistingTypes = 0;

		/** Set of inset types which are visible */
		private @InsetsType int mVisibleTypes = WindowInsets.Type.defaultVisible();

		@@ -906,6 +909,12 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
		}
		mVisibleTypes = visibleTypes;
		}
		if (mExistingTypes != existingTypes) {
		if (WindowInsets.Type.hasCompatSystemBars(mExistingTypes ^ existingTypes)) {
		mCompatSysUiVisibilityStaled = true;
		}
		mExistingTypes = existingTypes;
		}
		InsetsState.traverse(mState, newState, mRemoveGoneSources);

		updateDisabledUserAnimationTypes(disabledUserAnimationTypes);
		@@ -1662,7 +1671,8 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
		if (mCompatSysUiVisibilityStaled) {
		mCompatSysUiVisibilityStaled = false;
		mHost.updateCompatSysUiVisibility(
		mVisibleTypes, mRequestedVisibleTypes, mControllableTypes);
		// Treat non-existing types as controllable types for compatibility.
		mVisibleTypes, mRequestedVisibleTypes, mControllableTypes \| ~mExistingTypes);
		}
		}