Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 202b6d11 authored by Wang ArvinX's avatar Wang ArvinX Committed by android-build-merger
Browse files

Merge "Set Assistant UID of the current user." 

am: 19a2507e

Change-Id: I122144d2c9df8e6679435b9afd860353e3f11296
parents 77fc91c6 19a2507e

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

+4 −1
Original line number Diff line number Diff line
@@ -1461,10 +1461,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);