From d16c8f3e13c127e6e8c76c649e3caf140a104c53 Mon Sep 17 00:00:00 2001 From: Simon Wingrove Date: Fri, 3 Mar 2023 20:14:19 +0000 Subject: [PATCH] Put development flag behind IS_ENG check Per discussion, this flag was only ever needed for development debugging. Therefore for optimization (not having lots of apps register an observer to DeviceConfig) and potentially reducing problems caused by having multiple packages all reading from one namespace, put behind an ENG build check Test: manual Bug: 265145724 Change-Id: Ia6f2ee781c431088cbb3417c1b6bac86cfce4c13 --- core/java/android/app/AppOpsManager.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 9bf9e0c8eec34..7c32c9cd634f8 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -7200,10 +7200,16 @@ public class AppOpsManager { if (mContext != null) { final PackageManager pm = mContext.getPackageManager(); try { - if (pm != null && pm.checkPermission(Manifest.permission.READ_DEVICE_CONFIG, - mContext.getPackageName()) == PackageManager.PERMISSION_GRANTED) { - DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_PRIVACY, - mContext.getMainExecutor(), properties -> { + if (Build.IS_ENG + && pm != null + && pm.checkPermission( + Manifest.permission.READ_DEVICE_CONFIG, + mContext.getPackageName()) + == PackageManager.PERMISSION_GRANTED) { + DeviceConfig.addOnPropertiesChangedListener( + DeviceConfig.NAMESPACE_PRIVACY, + mContext.getMainExecutor(), + properties -> { if (properties.getKeyset().contains(FULL_LOG)) { sFullLog = properties.getBoolean(FULL_LOG, false); }