From add3f1bdf1fdba54516a2899268bceac08b047be Mon Sep 17 00:00:00 2001
From: Nate Myren <ntmyren@google.com>
Date: Wed, 17 Mar 2021 10:03:59 -0700
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index d310e8f0ef5c9..1d30fa6559095 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -9138,7 +9138,7 @@ public class AppOpsManager {
                 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;
                 }