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

Commit f1d2441d authored by Sergey Volnov's avatar Sergey Volnov Committed by Automerger Merge Worker
Browse files

Merge "Fix content capture not being usable from hotword detector." into sc-dev am: 78456de8 

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

Change-Id: I92eb770088aab0356e0510040eaf5f55c6e559d6
parents dcbf0547 78456de8

services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java

+32 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ import android.provider.Settings; 
import android.service.contentcapture.ActivityEvent.ActivityEventType;

import android.service.contentcapture.IDataShareCallback;

import android.service.contentcapture.IDataShareReadAdapter;

import android.service.voice.VoiceInteractionManagerInternal;

import android.util.ArraySet;

import android.util.LocalLog;

import android.util.Pair;
@@ -302,6 +303,37 @@ public final class ContentCaptureManagerService extends 
                || super.isDisabledLocked(userId);

    }



    @Override

    protected void assertCalledByPackageOwner(@NonNull String packageName) {

        try {

            super.assertCalledByPackageOwner(packageName);

        } catch (SecurityException e) {

            final int callingUid = Binder.getCallingUid();



            VoiceInteractionManagerInternal.HotwordDetectionServiceIdentity

                    hotwordDetectionServiceIdentity =

                    LocalServices.getService(VoiceInteractionManagerInternal.class)

                            .getHotwordDetectionServiceIdentity();



            if (callingUid != hotwordDetectionServiceIdentity.getIsolatedUid()) {

                super.assertCalledByPackageOwner(packageName);

                return;

            }



            final String[] packages =

                    getContext()

                            .getPackageManager()

                            .getPackagesForUid(hotwordDetectionServiceIdentity.getOwnerUid());

            if (packages != null) {

                for (String candidate : packages) {

                    if (packageName.equals(candidate)) return; // Found it

                }

            }



            throw e;

        }

    }



    private boolean isDisabledBySettingsLocked(@UserIdInt int userId) {

        return mDisabledBySettings != null && mDisabledBySettings.get(userId);

    }

services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java

+19 −5
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.service.contentcapture.FlushMetrics; 
import android.service.contentcapture.IContentCaptureServiceCallback;

import android.service.contentcapture.IDataShareCallback;

import android.service.contentcapture.SnapshotData;

import android.service.voice.VoiceInteractionManagerInternal;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.Slog;
@@ -415,6 +416,18 @@ final class ContentCapturePerUserService 
        }

        if (callingUid != packageUid && !LocalServices.getService(ActivityManagerInternal.class)

                .hasRunningActivity(callingUid, packageName)) {



            VoiceInteractionManagerInternal.HotwordDetectionServiceIdentity

                    hotwordDetectionServiceIdentity =

                    LocalServices.getService(VoiceInteractionManagerInternal.class)

                            .getHotwordDetectionServiceIdentity();



            boolean isHotwordDetectionServiceCall =

                    hotwordDetectionServiceIdentity != null

                            && callingUid == hotwordDetectionServiceIdentity.getIsolatedUid()

                            && packageUid == hotwordDetectionServiceIdentity.getOwnerUid();



            if (!isHotwordDetectionServiceCall) {

                final String[] packages = pm.getPackagesForUid(callingUid);

                final String callingPackage = packages != null ? packages[0] : "uid-" + callingUid;

                Slog.w(TAG, "App (package=" + callingPackage + ", UID=" + callingUid
@@ -423,6 +436,7 @@ final class ContentCapturePerUserService 
                throw new SecurityException("Invalid package: " + packageName);

            }

        }

    }



    @GuardedBy("mLock")

    public boolean sendActivityAssistDataLocked(@NonNull IBinder activityToken,

services/core/java/com/android/server/infra/AbstractMasterSystemService.java

+1 −1
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem 
     *

     * @throws SecurityException when it's not...

     */

    protected final void assertCalledByPackageOwner(@NonNull String packageName) {

    protected void assertCalledByPackageOwner(@NonNull String packageName) {

        Objects.requireNonNull(packageName);

        final int uid = Binder.getCallingUid();

        final String[] packages = getContext().getPackageManager().getPackagesForUid(uid);