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

Commit 93cb5359 authored by Charles Chen's avatar Charles Chen Committed by Automerger Merge Worker
Browse files

Merge "Allow package names to be retrieved for HotwordDetectionService" into udc-dev am: 011d00e1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22212446



Change-Id: Iadd487192154b0b3d1235281dfe5e8c770640e18
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7b6512b 011d00e1

services/core/java/com/android/server/pm/ComputerEngine.java

+10 −0
Original line number Diff line number Diff line
@@ -4298,6 +4298,11 @@ public class ComputerEngine implements Computer { 
        if (Process.isSdkSandboxUid(uid)) {

            uid = getBaseSdkSandboxUid();

        }

        if (Process.isIsolatedUid(uid)

                && mPermissionManager.getHotwordDetectionServiceProvider() != null

                && uid == mPermissionManager.getHotwordDetectionServiceProvider().getUid()) {

            uid = getIsolatedOwner(uid);

        }

        final int callingUserId = UserHandle.getUserId(callingUid);

        final int appId = UserHandle.getAppId(uid);

        final Object obj = mSettings.getSettingBase(appId);
@@ -4334,6 +4339,11 @@ public class ComputerEngine implements Computer { 
            if (Process.isSdkSandboxUid(uid)) {

                uid = getBaseSdkSandboxUid();

            }

            if (Process.isIsolatedUid(uid)

                    && mPermissionManager.getHotwordDetectionServiceProvider() != null

                    && uid == mPermissionManager.getHotwordDetectionServiceProvider().getUid()) {

                uid = getIsolatedOwner(uid);

            }

            final int appId = UserHandle.getAppId(uid);

            final Object obj = mSettings.getSettingBase(appId);

            if (obj instanceof SharedUserSetting) {