commit add3f1bdf1fdba54516a2899268bceac08b047be
author Nate Myren <ntmyren@google.com> Wed Mar 17 10:03:59 2021 -0700
committer Nate Myren <ntmyren@google.com> Wed Mar 17 10:03:59 2021 -0700
tree cae9b5777ddd550cf3272af8e68fadc7dc5b35f4
parent 8dc4ecd2c839247a44be41b47eebe415e813725a

Expand try/catch for DeviceConfig in AppOpsManager

Some apps, such as the shell, do not seem to be able to always access
the DeviceConfig, and get an NPE. Fail gracefully when this happens.

Test: manual
Fixes: 182907280
Change-Id: If4de34f2022c165ad8bf5a950c8a04cfd5abacc9

core/java/android/app/AppOpsManager.java

diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index d310e8f..1d30fa6 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -9138,7 +9138,7 @@
                 try {
                     sFullLog = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
                             FULL_LOG, false);
-                } catch (SecurityException e) {
+                } catch (Exception e) {
                     // This should not happen, but it may, in rare cases
                     sFullLog = false;
                 }