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

Commit a8f91f8d authored by Michael Dooley's avatar Michael Dooley Committed by android-build-merger
Browse files

Merge "Adding config to disable temporary permission granting" into oc-dev am: b65719af 

am: 0f5f0568

Change-Id: I794fb66edcc24246bc1acb8b46d28542ab8d570c
parents 7286d181 0f5f0568

res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -46,4 +46,8 @@ 
         different source (connection service) from the existing ringing call when reaching

         maximum ringing calls. -->

    <bool name="silence_incoming_when_different_service_and_maximum_ringing">false</bool>



    <!-- Determines if the granting temporary location permission to the default dialer

         during an emergency call should be allowed.  The default is false. -->

    <bool name="grant_location_permission_enabled">false</bool>

</resources>

src/com/android/server/telecom/EmergencyCallHelper.java

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ public class EmergencyCallHelper { 
    }



    private boolean shouldGrantTemporaryLocationPermission(Call call) {

        if (!mContext.getResources().getBoolean(R.bool.grant_location_permission_enabled)) {

            Log.i(this, "ShouldGrantTemporaryLocationPermission, disabled by config");

            return false;

        }

        if (call == null) {

            Log.i(this, "ShouldGrantTemporaryLocationPermission, no call");

            return false;