Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Properly check for SDK before nullifying attribution tag" into sc-dev am: b3c8d6d2e0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14940427

Change-Id: I5df6b730463cad92d108ff13d4f18256b977b673
This commit is contained in:
TreeHugger Robot
2021-06-15 19:47:26 +00:00
committed by Automerger Merge Worker
parent 621bd94b92 b3c8d6d2e0
commit 7b99553525
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/speech/RecognitionService.java
View File

@@ -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())) {

12
services/core/java/com/android/server/appop/AppOpsService.java
View File

@@ -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) {
}
}