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

Commit d65ea4d3 authored by Nathan Harold's avatar Nathan Harold Committed by Automerger Merge Worker
Browse files

Merge "Add TelephonyRegistry LOCATION checks" into rvc-dev am: b1755b5e am:... 

Merge "Add TelephonyRegistry LOCATION checks" into rvc-dev am: b1755b5e am: 03def1e1 am: d99bda65

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

Change-Id: I4b8d3216b0266d6d12de65562537ccc598826bd0
parents 10a6862c d99bda65

services/core/java/com/android/server/TelephonyRegistry.java

+20 −17
Original line number Original line Diff line number Diff line
@@ -310,12 +310,15 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
    private List<Map<Integer, PreciseDataConnectionState>> mPreciseDataConnectionStates =

    private List<Map<Integer, PreciseDataConnectionState>> mPreciseDataConnectionStates =

            new ArrayList<Map<Integer, PreciseDataConnectionState>>();

            new ArrayList<Map<Integer, PreciseDataConnectionState>>();





    // Nothing here yet, but putting it here in case we want to add more in the future.

    static final int ENFORCE_COARSE_LOCATION_PERMISSION_MASK =

    static final int ENFORCE_COARSE_LOCATION_PERMISSION_MASK = 0;

            PhoneStateListener.LISTEN_REGISTRATION_FAILURE

                    | PhoneStateListener.LISTEN_BARRING_INFO;





    static final int ENFORCE_FINE_LOCATION_PERMISSION_MASK =

    static final int ENFORCE_FINE_LOCATION_PERMISSION_MASK =

            PhoneStateListener.LISTEN_CELL_LOCATION

            PhoneStateListener.LISTEN_CELL_LOCATION

                    | PhoneStateListener.LISTEN_CELL_INFO;

                    | PhoneStateListener.LISTEN_CELL_INFO

                    | PhoneStateListener.LISTEN_REGISTRATION_FAILURE

                    | PhoneStateListener.LISTEN_BARRING_INFO;





    static final int ENFORCE_PHONE_STATE_PERMISSION_MASK =

    static final int ENFORCE_PHONE_STATE_PERMISSION_MASK =

            PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR

            PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR