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

Commit 4e0c7d16 authored by Nathan Harold's avatar Nathan Harold
Browse files

Improve location checks in TelephonyRegistry 

Improve location checking for apps targeting SDK28
or earlier.

Bug: 158484422
Test: (cts) atest TelephonyLocationTests; atest PhoneStateListenerTest
Change-Id: I8caa3ea409836ce8469d8d8210b481a0284594f2
parent b617da0e

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

+30 −22
Original line number Diff line number Diff line
@@ -311,11 +311,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
    private List<Map<Integer, PreciseDataConnectionState>> mPreciseDataConnectionStates =

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



    static final int ENFORCE_COARSE_LOCATION_PERMISSION_MASK =

            PhoneStateListener.LISTEN_REGISTRATION_FAILURE

                    | PhoneStateListener.LISTEN_BARRING_INFO;



    static final int ENFORCE_FINE_LOCATION_PERMISSION_MASK =

    // Starting in Q, almost all cellular location requires FINE location enforcement.

    // Prior to Q, cellular was available with COARSE location enforcement. Bits in this

    // list will be checked for COARSE on apps targeting P or earlier and FINE on Q or later.

    static final int ENFORCE_LOCATION_PERMISSION_MASK =

            PhoneStateListener.LISTEN_CELL_LOCATION

                    | PhoneStateListener.LISTEN_CELL_INFO

                    | PhoneStateListener.LISTEN_REGISTRATION_FAILURE
@@ -372,7 +371,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                                + " newDefaultPhoneId=" + newDefaultPhoneId);

                    }



                    //Due to possible risk condition,(notify call back using the new

                    //Due to possible race condition,(notify call back using the new

                    //defaultSubId comes before new defaultSubId update) we need to recall all

                    //possible missed notify callback

                    synchronized (mRecords) {
@@ -905,7 +904,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                    if (validateEventsAndUserLocked(r, PhoneStateListener.LISTEN_CELL_LOCATION)) {

                        try {

                            if (DBG_LOC) log("listen: mCellIdentity = " + mCellIdentity[phoneId]);

                            if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {

                            if (checkCoarseLocationAccess(r, Build.VERSION_CODES.BASE)

                                    && checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {

                                // null will be translated to empty CellLocation object in client.

                                r.callback.onCellLocationChanged(mCellIdentity[phoneId]);

                            }
@@ -960,7 +960,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                        try {

                            if (DBG_LOC) log("listen: mCellInfo[" + phoneId + "] = "

                                    + mCellInfo.get(phoneId));

                            if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {

                            if (checkCoarseLocationAccess(r, Build.VERSION_CODES.BASE)

                                    && checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {

                                r.callback.onCellInfoChanged(mCellInfo.get(phoneId));

                            }

                        } catch (RemoteException ex) {
@@ -1514,7 +1515,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                for (Record r : mRecords) {

                    if (validateEventsAndUserLocked(r, PhoneStateListener.LISTEN_CELL_INFO) &&

                            idMatch(r.subId, subId, phoneId) &&

                            checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {

                            (checkCoarseLocationAccess(r, Build.VERSION_CODES.BASE)

                                    && checkFineLocationAccess(r, Build.VERSION_CODES.Q))) {

                        try {

                            if (DBG_LOC) {

                                log("notifyCellInfoForSubscriber: mCellInfo=" + cellInfo
@@ -1846,7 +1848,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                for (Record r : mRecords) {

                    if (validateEventsAndUserLocked(r, PhoneStateListener.LISTEN_CELL_LOCATION) &&

                            idMatch(r.subId, subId, phoneId) &&

                            checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {

                            (checkCoarseLocationAccess(r, Build.VERSION_CODES.BASE)

                                    && checkFineLocationAccess(r, Build.VERSION_CODES.Q))) {

                        try {

                            if (DBG_LOC) {

                                log("notifyCellLocation: cellLocation=" + cellLocation
@@ -2627,16 +2630,11 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 


        boolean shouldCheckLocationPermissions = false;



        if ((events & ENFORCE_FINE_LOCATION_PERMISSION_MASK) != 0) {

        if ((events & ENFORCE_LOCATION_PERMISSION_MASK) != 0) {

            // Everything that requires fine location started in Q. So far...

            locationQueryBuilder.setMinSdkVersionForFine(Build.VERSION_CODES.Q);

            // If we're enforcing fine starting in Q, we also want to enforce coarse starting in Q.

            locationQueryBuilder.setMinSdkVersionForCoarse(Build.VERSION_CODES.Q);

            locationQueryBuilder.setMinSdkVersionForEnforcement(Build.VERSION_CODES.Q);

            shouldCheckLocationPermissions = true;

        }



        if ((events & ENFORCE_COARSE_LOCATION_PERMISSION_MASK) != 0) {

            // If we're enforcing fine starting in Q, we also want to enforce coarse even for

            // older SDK versions.

            locationQueryBuilder.setMinSdkVersionForCoarse(0);

            locationQueryBuilder.setMinSdkVersionForEnforcement(0);

            shouldCheckLocationPermissions = true;
@@ -2833,8 +2831,16 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            try {

                if (VDBG) log("checkPossibleMissNotify: onServiceStateChanged state=" +

                        mServiceState[phoneId]);

                ServiceState ss = new ServiceState(mServiceState[phoneId]);

                if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {

                    r.callback.onServiceStateChanged(ss);

                } else if (checkCoarseLocationAccess(r, Build.VERSION_CODES.Q)) {

                    r.callback.onServiceStateChanged(

                            ss.createLocationInfoSanitizedCopy(false));

                } else {

                    r.callback.onServiceStateChanged(

                        new ServiceState(mServiceState[phoneId]));

                            ss.createLocationInfoSanitizedCopy(true));

                }

            } catch (RemoteException ex) {

                mRemoveList.add(r.binder);

            }
@@ -2879,7 +2885,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                    log("checkPossibleMissNotify: onCellInfoChanged[" + phoneId + "] = "

                            + mCellInfo.get(phoneId));

                }

                if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {

                if (checkCoarseLocationAccess(r, Build.VERSION_CODES.BASE)

                        && checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {

                    r.callback.onCellInfoChanged(mCellInfo.get(phoneId));

                }

            } catch (RemoteException ex) {
@@ -2945,7 +2952,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                    log("checkPossibleMissNotify: onCellLocationChanged mCellIdentity = "

                            + mCellIdentity[phoneId]);

                }

                if (checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {

                if (checkCoarseLocationAccess(r, Build.VERSION_CODES.BASE)

                        && checkFineLocationAccess(r, Build.VERSION_CODES.Q)) {

                    // null will be translated to empty CellLocation object in client.

                    r.callback.onCellLocationChanged(mCellIdentity[phoneId]);

                }