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

Commit 0086838a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add permissions check to isInSignificantPlace()" into main

parents 9c0ce1f7 389e4cf7

core/java/android/app/trust/ITrustManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -41,5 +41,6 @@ interface ITrustManager { 
    void unlockedByBiometricForUser(int userId, in BiometricSourceType source);

    void clearAllBiometricRecognized(in BiometricSourceType target, int unlockedUser);

    boolean isActiveUnlockRunning(int userId);

    @EnforcePermission("ACCESS_FINE_LOCATION")

    boolean isInSignificantPlace();

}

core/java/android/app/trust/TrustManager.java

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ public class TrustManager { 
     *

     * @hide

     */

    @RequiresPermission(Manifest.permission.ACCESS_FINE_LOCATION)

    public boolean isInSignificantPlace() {

        try {

            return mService.isInSignificantPlace();

services/core/java/com/android/server/trust/TrustManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.service.trust.GrantTrustResult.STATUS_UNLOCKED_BY_GRANT; 
import static android.service.trust.TrustAgentService.FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE;



import android.Manifest;

import android.annotation.EnforcePermission;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UserIdInt;
@@ -1896,8 +1897,11 @@ public class TrustManagerService extends SystemService { 
            }

        }



        @EnforcePermission(Manifest.permission.ACCESS_FINE_LOCATION)

        @Override

        public boolean isInSignificantPlace() {

            super.isInSignificantPlace_enforcePermission();



            if (android.security.Flags.significantPlaces()) {

                mSignificantPlaceServiceWatcher.runOnBinder(

                        binder -> ISignificantPlaceProvider.Stub.asInterface(binder)