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

Commit 02436e51 authored by Mike Lockwood's avatar Mike Lockwood Committed by The Android Open Source Project
Browse files

am ac61f6bc: Telephony: Allow getCellLocation() if client has permission ACCESS_FINE_LOCATION 

Merge commit 'ac61f6bc'

* commit 'ac61f6bc':
  Telephony: Allow getCellLocation() if client has permission ACCESS_FINE_LOCATION
parents 55cf0cac ac61f6bc

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

+7 −3
Original line number Diff line number Diff line
@@ -112,9 +112,13 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        if (events != 0) {

            // check permissions

            if ((events & PhoneStateListener.LISTEN_CELL_LOCATION) != 0) {

                // ACCESS_FINE_LOCATION implies ACCESS_COARSE_LOCATION

                if (mContext.checkCallingPermission(

                        android.Manifest.permission.ACCESS_FINE_LOCATION)

                        != PackageManager.PERMISSION_GRANTED) {

                    mContext.enforceCallingOrSelfPermission(

                            android.Manifest.permission.ACCESS_COARSE_LOCATION, null);



                }

            }



            synchronized (mRecords) {

telephony/java/android/telephony/TelephonyManager.java

+3 −2
Original line number Diff line number Diff line
@@ -192,8 +192,9 @@ public class TelephonyManager { 
    /**

     * Returns the current location of the device.

     *

     * <p>Requires Permission: {@link android.Manifest.permission#ACCESS_COARSE_LOCATION

     * ACCESS_COARSE_LOCATION}.

     * <p>Requires Permission:

     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or

     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_FINE_LOCATION}.

     */

    public CellLocation getCellLocation() {

        try {