From b23f0c30c85006b79ea534fd3fef111dd217dc87 Mon Sep 17 00:00:00 2001
From: Evan Severson <evanseverson@google.com>
Date: Thu, 1 Jul 2021 08:51:09 -0700
Subject: [PATCH] Catch Illegal argument exception

This is probably a sign that something is calling startOp() on an app
that isn't even running, but the service shouldn't take out the system
server when this happens.

Test: Presubmit tests
Fixes: 192557017
Change-Id: I7aae3f37d08303fb17aa8d0af3c9a56bd25b36af
---
 .../java/com/android/server/SensorPrivacyService.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/SensorPrivacyService.java b/services/core/java/com/android/server/SensorPrivacyService.java
index c07d6690e5a0f..3833a9dd298bb 100644
--- a/services/core/java/com/android/server/SensorPrivacyService.java
+++ b/services/core/java/com/android/server/SensorPrivacyService.java
@@ -440,7 +440,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 =