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

Commit 22ca59c4 authored by Rafael Higuera Silva's avatar Rafael Higuera Silva
Browse files

Fix include location data to check for coarse location first. 

Bug: 222766399
Test: make, atest TelephonyLocationTests, manual
Change-Id: Id277d16aceb58324ec70eadfcd3fb871821707c9
parent 3e0d815e

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -1030,12 +1030,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                callingFeatureId, callback, eventList, notifyNow, subId);

                callingFeatureId, callback, eventList, notifyNow, subId);

    }

    }





    private void listen(String callingPackage, @Nullable String callingFeatureId,

            IPhoneStateListener callback, Set<Integer> events, boolean notifyNow, int subId) {

        listen(false, false, callingPackage,

                callingFeatureId, callback, events, notifyNow, subId);

    }



    private void listen(boolean renounceFineLocationAccess,

    private void listen(boolean renounceFineLocationAccess,

            boolean renounceCoarseLocationAccess, String callingPackage,

            boolean renounceCoarseLocationAccess, String callingPackage,

            @Nullable String callingFeatureId, IPhoneStateListener callback,

            @Nullable String callingFeatureId, IPhoneStateListener callback,

telephony/java/android/telephony/TelephonyManager.java

+15 −19
Original line number Original line Diff line number Diff line
@@ -12171,15 +12171,7 @@ public class TelephonyManager { 
    })

    })

    @RequiresFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS)

    @RequiresFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS)

    public @Nullable ServiceState getServiceState() {

    public @Nullable ServiceState getServiceState() {

        if (getRenouncedPermissions().contains(Manifest.permission.ACCESS_FINE_LOCATION))  {

        return getServiceState(getLocationData());

            if (getRenouncedPermissions().contains(Manifest.permission.ACCESS_COARSE_LOCATION)) {

                return getServiceState(INCLUDE_LOCATION_DATA_NONE);

            } else {

                return getServiceState(INCLUDE_LOCATION_DATA_COARSE);

            }

        }














        return getServiceState(INCLUDE_LOCATION_DATA_FINE);














    }







    }



























    /**







    /**










@@ -16170,19 +16162,23 @@ public class TelephonyManager {









     */







     */











    public void registerTelephonyCallback(@NonNull @CallbackExecutor Executor executor,







    public void registerTelephonyCallback(@NonNull @CallbackExecutor Executor executor,











            @NonNull TelephonyCallback callback) {







            @NonNull TelephonyCallback callback) {











        if (getRenouncedPermissions().contains(Manifest.permission.ACCESS_FINE_LOCATION))  {







        registerTelephonyCallback(getLocationData(), executor, callback);











            if (getRenouncedPermissions().contains(Manifest.permission.ACCESS_COARSE_LOCATION)) {







    }











                registerTelephonyCallback(INCLUDE_LOCATION_DATA_NONE, executor, callback);

















                return;







    private int getLocationData() {














        boolean renounceCoarseLocation =














                getRenouncedPermissions().contains(Manifest.permission.ACCESS_COARSE_LOCATION);














        boolean renounceFineLocation =














                getRenouncedPermissions().contains(Manifest.permission.ACCESS_FINE_LOCATION);














        if (renounceCoarseLocation) {














            return INCLUDE_LOCATION_DATA_NONE;














        } else if (renounceFineLocation) {














            return INCLUDE_LOCATION_DATA_COARSE;











        } else {







        } else {











                registerTelephonyCallback(INCLUDE_LOCATION_DATA_COARSE, executor, callback);







            return INCLUDE_LOCATION_DATA_FINE;











                return;














        }







        }











    }







    }



























        registerTelephonyCallback(INCLUDE_LOCATION_DATA_FINE, executor, callback);














    }



























    /** @hide */







    /** @hide */











    @Retention(RetentionPolicy.SOURCE)







    @Retention(RetentionPolicy.SOURCE)











    @IntDef(prefix = {"INCLUDE_LOCATION_DATA_"}, value = {







    @IntDef(prefix = {"INCLUDE_LOCATION_DATA_"}, value = {