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

Commit fd0c2dda authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Unhide the secure setting for LocationProviderEnabled"

parents 122b3094 a3d5e0c5

api/current.xml

+32 −0
Original line number Diff line number Diff line
@@ -131147,6 +131147,21 @@ 
<parameter name="name" type="java.lang.String">

</parameter>

</method>

<method name="isLocationProviderEnabled"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="cr" type="android.content.ContentResolver">

</parameter>

<parameter name="provider" type="java.lang.String">

</parameter>

</method>

<method name="putFloat"

 return="boolean"

 abstract="false"
@@ -131215,6 +131230,23 @@ 
<parameter name="value" type="java.lang.String">

</parameter>

</method>

<method name="setLocationProviderEnabled"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="cr" type="android.content.ContentResolver">

</parameter>

<parameter name="provider" type="java.lang.String">

</parameter>

<parameter name="enabled" type="boolean">

</parameter>

</method>

<field name="ACCESSIBILITY_ENABLED"

 type="java.lang.String"

 transient="false"

core/java/android/provider/Settings.java

+0 −4
Original line number Diff line number Diff line
@@ -2977,8 +2977,6 @@ public final class Settings { 
         * @param cr the content resolver to use

         * @param provider the location provider to query

         * @return true if the provider is enabled

         *

         * @hide

         */

        public static final boolean isLocationProviderEnabled(ContentResolver cr, String provider) {

            String allowedProviders = Settings.Secure.getString(cr, LOCATION_PROVIDERS_ALLOWED);
@@ -2996,8 +2994,6 @@ public final class Settings { 
         * @param cr the content resolver to use

         * @param provider the location provider to enable or disable

         * @param enabled true if the provider should be enabled

         *

         * @hide

         */

        public static final void setLocationProviderEnabled(ContentResolver cr,

                String provider, boolean enabled) {