Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 202b6d11e4

Change-Id: I62cc7133ad90c78d350f2ce2f599cc7dee3cf64f
This commit is contained in:
Wang ArvinX
2019-11-12 09:38:48 -08:00
committed by android-build-merger
parent 46b6b2b293 202b6d11e4
commit 022a88a9b7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/audio/AudioService.java
View File

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