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: I773a6ae0998476845f6027d708bb99d65fb4fbb6
This commit is contained in:
Evan Severson
2021-07-01 19:14:41 +00:00
committed by Automerger Merge Worker

View File

@@ -441,7 +441,14 @@ public final class SensorPrivacyService extends SystemService {
inputMethodPackageName = ComponentName.unflattenFromString( inputMethodPackageName = ComponentName.unflattenFromString(
inputMethodComponent).getPackageName(); 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) { if (sensor == MICROPHONE) {
VoiceInteractionManagerInternal voiceInteractionManagerInternal = VoiceInteractionManagerInternal voiceInteractionManagerInternal =