commit 202b6d11e49605029b542cc5d58fcf9e2ccb8fb5
author Wang ArvinX <arvinx.wang@intel.com> Tue Nov 12 09:30:27 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 12 09:30:27 2019 -0800
tree 5a72e8bae7005711ca7b0522437bb7aef1bdc991
parent 77fc91c6a8fbb3c5937ffaf06598fb5740e68357
parent 19a2507ea5c004d0dff45c63c0a611aef6e54136

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

Change-Id: I122144d2c9df8e6679435b9afd860353e3f11296

services/core/java/com/android/server/audio/AudioService.java

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 24569a6..1f1e8a5 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -1461,10 +1461,13 @@
         }
         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);