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

Commit 8c690ea9 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 2182 into donut 

* changes:
  location: Replace ILocationCollector interface with new ILocationProvider method
parents db79edc5 fd6e5f0d

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ LOCAL_SRC_FILES += \ 
	location/java/android/location/IGeocodeProvider.aidl \

	location/java/android/location/IGpsStatusListener.aidl \

	location/java/android/location/IGpsStatusProvider.aidl \

	location/java/android/location/ILocationCollector.aidl \

	location/java/android/location/ILocationListener.aidl \

	location/java/android/location/ILocationManager.aidl \

	location/java/android/location/ILocationProvider.aidl \

api/current.xml

+0 −11
Original line number Diff line number Diff line
@@ -529,17 +529,6 @@ 
 visibility="public"

>

</field>

<field name="INSTALL_LOCATION_COLLECTOR"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.permission.INSTALL_LOCATION_COLLECTOR&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="INSTALL_LOCATION_PROVIDER"

 type="java.lang.String"

 transient="false"

core/res/AndroidManifest.xml

+0 −6
Original line number Diff line number Diff line
@@ -220,12 +220,6 @@ 
        android:label="@string/permlab_installLocationProvider"

        android:description="@string/permdesc_installLocationProvider" />



    <!-- Allows an application to install a location collector into the Location Manager -->

    <permission android:name="android.permission.INSTALL_LOCATION_COLLECTOR"

        android:protectionLevel="signatureOrSystem"

        android:label="@string/permlab_installLocationCollector"

        android:description="@string/permdesc_installLocationCollector" />



    <!-- ======================================= -->

    <!-- Permissions for accessing networks -->

    <!-- ======================================= -->

core/res/res/values/strings.xml

+1 −7
Original line number Diff line number Diff line
@@ -769,13 +769,7 @@ 
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_installLocationProvider">Create mock location sources for testing.

        Malicious applications can use this to override the location and/or status returned by real

        location sources such as GPS or Network providers.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_installLocationCollector">permission to install a location collector</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_installLocationCollector">Create mock location sources for testing.

        Malicious applications can use this to monitor and report your location to an external source.</string>

        location sources such as GPS or Network providers or monitor and report your location to an external source.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_accessFineLocation">fine (GPS) location</string>

data/etc/platform.xml

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ 
    <assign-permission name="android.permission.READ_FRAME_BUFFER" uid="shell" />

    <assign-permission name="android.permission.DEVICE_POWER" uid="shell" />

    <assign-permission name="android.permission.INSTALL_LOCATION_PROVIDER" uid="shell" />

    <assign-permission name="android.permission.INSTALL_LOCATION_COLLECTOR" uid="shell" />



    <assign-permission name="android.permission.MODIFY_AUDIO_SETTINGS" uid="media" />

    <assign-permission name="android.permission.ACCESS_DRM" uid="media" />