Merge "Properly check for SDK before nullifying attribution tag" into sc-dev (b3c8d6d2) · Commits · e / os / android_frameworks_base

core/java/android/speech/RecognitionService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -229,6 +229,7 @@ public abstract class RecognitionService extends Service {
		protected abstract void onStopListening(Callback listener);

		@Override
		@SuppressLint("MissingNullability")
		public Context createContext(@NonNull ContextParams contextParams) {
		if (contextParams.getNextAttributionSource() != null) {
		if (mHandler.getLooper().equals(Looper.myLooper())) {

+6 −6

Original line number	Diff line number	Diff line
		@@ -4558,15 +4558,15 @@ public class AppOpsService extends IAppOpsService.Stub {
		}

		try {
		if (mPlatformCompat.isChangeEnabledByPackageName(
		if (!mPlatformCompat.isChangeEnabledByPackageName(
		SECURITY_EXCEPTION_ON_INVALID_ATTRIBUTION_TAG_CHANGE, packageName,
		userId) && mPlatformCompat.isChangeEnabledByUid(
		userId) \|\| !mPlatformCompat.isChangeEnabledByUid(
		SECURITY_EXCEPTION_ON_INVALID_ATTRIBUTION_TAG_CHANGE,
		callingUid) && !isAttributionTagValid) {
		Slog.e(TAG, msg);
		} else {
		Slog.e(TAG, msg);
		callingUid)) {
		// Do not override tags if overriding is not enabled for this package
		isAttributionTagValid = true;
		}
		Slog.e(TAG, msg);
		} catch (RemoteException neverHappens) {
		}
		}