From 3431494880996fe2fdc497187be16518f3e97454 Mon Sep 17 00:00:00 2001 From: Nate Myren Date: Thu, 24 Jun 2021 19:15:49 +0000 Subject: Revert "TEMP add missing remap log, reduce log spam" Revert "TEMP add app ops debug logs" This reverts commit b05444be8c61df3f6e3d88d872ce873019cf0580. This reverts commit 39c56f4be24cb60b13e2c8fd05c9298c292d2c75. Reason for revert: no longer needed Test: build Fixes: 192279096 Change-Id: I2749a8c2c8fe1f9885d23d21f71474aac4b4b5d2 --- .../com/android/server/appop/AppOpsService.java | 44 +++------------------- .../com/android/server/policy/AppOpsPolicy.java | 23 ----------- 2 files changed, 5 insertions(+), 62 deletions(-) diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java index 99a33e4462e2..26d05c8b2a3f 100644 --- a/services/core/java/com/android/server/appop/AppOpsService.java +++ b/services/core/java/com/android/server/appop/AppOpsService.java @@ -3372,21 +3372,11 @@ public class AppOpsService extends IAppOpsService.Stub { boolean shouldCollectMessage) { PackageVerificationResult pvr; try { - boolean isLocOrActivity = code == AppOpsManager.OP_FINE_LOCATION - || code == AppOpsManager.OP_FINE_LOCATION_SOURCE - || code == AppOpsManager.OP_ACTIVITY_RECOGNITION - || code == AppOpsManager.OP_ACTIVITY_RECOGNITION_SOURCE; - pvr = verifyAndGetBypass(uid, packageName, attributionTag, proxyPackageName, - isLocOrActivity); + pvr = verifyAndGetBypass(uid, packageName, attributionTag, proxyPackageName); boolean wasNull = attributionTag == null; if (!pvr.isAttributionTagValid) { attributionTag = null; } - if (attributionTag == null && isLocOrActivity - && packageName.equals("com.google.android.gms")) { - Slog.i("AppOpsDebug", "null tag on location or activity op " + code - + " for " + packageName + ", was overridden: " + !wasNull, new Exception()); - } } catch (SecurityException e) { Slog.e(TAG, "noteOperation", e); return new SyncNotedAppOp(AppOpsManager.MODE_ERRORED, code, attributionTag, @@ -3893,20 +3883,10 @@ public class AppOpsService extends IAppOpsService.Stub { int attributionChainId, boolean dryRun) { PackageVerificationResult pvr; try { - boolean isLocOrActivity = code == AppOpsManager.OP_FINE_LOCATION - || code == AppOpsManager.OP_FINE_LOCATION_SOURCE - || code == AppOpsManager.OP_ACTIVITY_RECOGNITION - || code == AppOpsManager.OP_ACTIVITY_RECOGNITION_SOURCE; - pvr = verifyAndGetBypass(uid, packageName, attributionTag, proxyPackageName, - isLocOrActivity); + pvr = verifyAndGetBypass(uid, packageName, attributionTag, proxyPackageName); if (!pvr.isAttributionTagValid) { attributionTag = null; } - if (attributionTag == null && isLocOrActivity - && packageName.equals("com.google.android.gms")) { - Slog.i("AppOpsDebug", "null tag on location or activity op " - + code + " for " + packageName, new Exception()); - } } catch (SecurityException e) { Slog.e(TAG, "startOperation", e); return new SyncNotedAppOp(AppOpsManager.MODE_ERRORED, code, attributionTag, @@ -4458,11 +4438,11 @@ public class AppOpsService extends IAppOpsService.Stub { } /** - * @see #verifyAndGetBypass(int, String, String, String, boolean) + * @see #verifyAndGetBypass(int, String, String, String) */ private @NonNull PackageVerificationResult verifyAndGetBypass(int uid, String packageName, @Nullable String attributionTag) { - return verifyAndGetBypass(uid, packageName, attributionTag, null, false); + return verifyAndGetBypass(uid, packageName, attributionTag, null); } /** @@ -4479,7 +4459,7 @@ public class AppOpsService extends IAppOpsService.Stub { * attribution tag is valid */ private @NonNull PackageVerificationResult verifyAndGetBypass(int uid, String packageName, - @Nullable String attributionTag, @Nullable String proxyPackageName, boolean extraLog) { + @Nullable String attributionTag, @Nullable String proxyPackageName) { if (uid == Process.ROOT_UID) { // For backwards compatibility, don't check package name for root UID. return new PackageVerificationResult(null, @@ -4526,20 +4506,6 @@ public class AppOpsService extends IAppOpsService.Stub { AndroidPackage pkg = pmInt.getPackage(packageName); if (pkg != null) { isAttributionTagValid = isAttributionInPackage(pkg, attributionTag); - if (packageName.equals("com.google.android.gms") && extraLog) { - if (isAttributionTagValid && attributionTag != null) { - Slog.i("AppOpsDebug", "tag " + attributionTag + " found in " - + packageName); - } else { - ArrayList tagList = new ArrayList<>(); - for (int i = 0; i < pkg.getAttributions().size(); i++) { - tagList.add(pkg.getAttributions().get(i).tag); - } - Slog.i("AppOpsDebug", "tag " + attributionTag + " missing from " - + packageName + ", tags: " + tagList); - } - } - pkgUid = UserHandle.getUid(userId, UserHandle.getAppId(pkg.getUid())); bypass = getBypassforPackage(pkg); } diff --git a/services/core/java/com/android/server/policy/AppOpsPolicy.java b/services/core/java/com/android/server/policy/AppOpsPolicy.java index 22c370ef4dbe..6aaf2e4f92b9 100644 --- a/services/core/java/com/android/server/policy/AppOpsPolicy.java +++ b/services/core/java/com/android/server/policy/AppOpsPolicy.java @@ -39,7 +39,6 @@ import android.os.UserHandle; import android.service.voice.VoiceInteractionManagerInternal; import android.service.voice.VoiceInteractionManagerInternal.HotwordDetectionServiceIdentity; import android.text.TextUtils; -import android.util.ArraySet; import android.util.Log; import android.util.SparseArray; @@ -68,10 +67,6 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat "android:activity_recognition_allow_listed_tags"; private static final String ACTIVITY_RECOGNITION_TAGS_SEPARATOR = ";"; - private static final ArraySet sExpectedTags = new ArraySet<>(new String[] { - "awareness_provider", "activity_recognition_provider", "network_location_provider", - "network_location_calibration", "fused_location_provider", "geofencer_provider"}); - @NonNull private final Object mLock = new Object(); @@ -260,32 +255,14 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat if (resolvedCode != code) { if (isDatasourceAttributionTag(uid, packageName, attributionTag, mLocationTags)) { - if (packageName.equals("com.google.android.gms") - && !sExpectedTags.contains(attributionTag)) { - Log.i("AppOpsDebugRemapping", "remapping " + packageName + " location " - + "for tag " + attributionTag); - } return resolvedCode; - } else if (packageName.equals("com.google.android.gms") - && sExpectedTags.contains(attributionTag)) { - Log.i("AppOpsDebugRemapping", "NOT remapping " + packageName + " code " - + code + " for tag " + attributionTag); } } else { resolvedCode = resolveArOp(code); if (resolvedCode != code) { if (isDatasourceAttributionTag(uid, packageName, attributionTag, mActivityRecognitionTags)) { - if (packageName.equals("com.google.android.gms") - && !sExpectedTags.contains(attributionTag)) { - Log.i("AppOpsDebugRemapping", "remapping " + packageName + " " - + "activity recognition for tag " + attributionTag); - } return resolvedCode; - } else if (packageName.equals("com.google.android.gms") - && sExpectedTags.contains(attributionTag)) { - Log.i("AppOpsDebugRemapping", "NOT remapping " + packageName - + " code " + code + " for tag " + attributionTag); } } } -- cgit v1.2.3-59-g8ed1b