Merge "Set Assistant UID of the current user." am: 19a2507ea5 am: 202b6d11e4

am: 022a88a9b7

Change-Id: Ibbe2761dfee2e35d017d67633651f0e659c05535
This commit is contained in:
Wang ArvinX
2019-11-12 09:43:56 -08:00
committed by android-build-merger

View File

@@ -1473,10 +1473,13 @@ public class AudioService extends IAudioService.Stub
}
if (!TextUtils.isEmpty(packageName)) {
PackageManager pm = mContext.getPackageManager();
ActivityManager am =
(ActivityManager) mContext.getSystemService(mContext.ACTIVITY_SERVICE);
if (pm.checkPermission(Manifest.permission.CAPTURE_AUDIO_HOTWORD, packageName)
== PackageManager.PERMISSION_GRANTED) {
try {
assistantUid = pm.getPackageUid(packageName, 0);
assistantUid = pm.getPackageUidAsUser(packageName, am.getCurrentUser());
} catch (PackageManager.NameNotFoundException e) {
Log.e(TAG,
"updateAssistantUId() could not find UID for package: " + packageName);