commit 883f474ea8ea07f93f25832bf705359407c982b5
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 17 19:29:56 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 17 19:29:56 2021 +0000
tree 7ddcc71b708d25da9161bd4b8ca84ebf732e5fc1
parent d5cf5ab4a826b5084fa64b47866f94c27abb7b21
parent add3f1bdf1fdba54516a2899268bceac08b047be

Merge "Expand try/catch for DeviceConfig in AppOpsManager" into sc-dev

core/java/android/app/AppOpsManager.java

diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index 60765fe..27b19bc 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -9148,7 +9148,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;
                 }