Merge "Catch Illegal argument exception" into sc-dev am: b04401df4e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15174877 Change-Id: Ie98111b9d98f71df2ab597754a731bf62d87e460
2021-07-01 19:13:34 +00:00
parent 6b8859a0a6 b04401df4e
commit 55f1f3ef7f
1 changed files with 8 additions and 1 deletions
--- a/services/core/java/com/android/server/SensorPrivacyService.java
+++ b/services/core/java/com/android/server/SensorPrivacyService.java
@@ -441,7 +441,14 @@ public final class SensorPrivacyService extends SystemService {
                inputMethodPackageName = ComponentName.unflattenFromString(
                        inputMethodComponent).getPackageName();
            }
-            int capability = mActivityManagerInternal.getUidCapability(uid);
+
+            int capability;
+            try {
+                capability = mActivityManagerInternal.getUidCapability(uid);
+            } catch (IllegalArgumentException e) {
+                Log.w(TAG, e);
+                return;
+            }

            if (sensor == MICROPHONE) {
                VoiceInteractionManagerInternal voiceInteractionManagerInternal =