From c72ae25629a1c06f170ba775c96ad5aa642aba34 Mon Sep 17 00:00:00 2001 From: Hai Zhang Date: Thu, 12 Dec 2019 22:29:45 +0000 Subject: [PATCH] Revert "Add Slog.wtf for calling setMode() with OP_COARSE_LOCATION." This reverts commit 2a31fd75a0090c0a7a7eb0df27664f2d9758a3e8. Reason for revert: Remove debugging info before R ships. Fixes: 146014123 Change-Id: Ic1804d6fb85d6259a1a8f83e9f6285625c8485a5 --- .../core/java/com/android/server/appop/AppOpsService.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java index 14f96540bc6a7..366766e2e47bc 100644 --- a/services/core/java/com/android/server/appop/AppOpsService.java +++ b/services/core/java/com/android/server/appop/AppOpsService.java @@ -20,7 +20,6 @@ import static android.app.ActivityManager.PROCESS_CAPABILITY_FOREGROUND_LOCATION import static android.app.AppOpsManager.MAX_PRIORITY_UID_STATE; import static android.app.AppOpsManager.MIN_PRIORITY_UID_STATE; import static android.app.AppOpsManager.OP_CAMERA; -import static android.app.AppOpsManager.OP_COARSE_LOCATION; import static android.app.AppOpsManager.OP_FLAGS_ALL; import static android.app.AppOpsManager.OP_NONE; import static android.app.AppOpsManager.OP_PLAY_AUDIO; @@ -1643,13 +1642,6 @@ public class AppOpsService extends IAppOpsService.Stub { return; } - // STOPSHIP: Remove this check once we are sure no one is doing it. - if (code == OP_COARSE_LOCATION && mode != AppOpsManager.opToDefaultMode(code)) { - Slog.wtf(TAG, "Trying to setMode() instead of setUidMode(), " + "code=" + code - + ", uid=" + uid + ", packageName=" + packageName + ", mode=" + mode - + ", callingUid=" + Binder.getCallingUid(), new RuntimeException()); - } - synchronized (this) { UidState uidState = getUidStateLocked(uid, false); Op op = getOpLocked(code, uid, packageName, isPrivileged, true);