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

Commit 29930a1c authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 3dcea047: Merge change 4237 into donut 

Merge commit '3dcea047'

* commit '3dcea047':
  Remove obsolete FOTA_UPDATE permission (which should never have been
parents e5856bca 3dcea047

api/4.xml

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

>

</field>

<field name="FOTA_UPDATE"

 type="java.lang.String"

 transient="false"

 volatile="false"

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

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="GET_ACCOUNTS"

 type="java.lang.String"

 transient="false"

api/current.xml

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

>

</field>

<field name="FOTA_UPDATE"

 type="java.lang.String"

 transient="false"

 volatile="false"

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

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="GET_ACCOUNTS"

 type="java.lang.String"

 transient="false"

core/res/AndroidManifest.xml

+6 −3
Original line number Diff line number Diff line
@@ -745,9 +745,12 @@ 
        android:description="@string/permdesc_forceBack"

        android:protectionLevel="signature" />



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

        android:label="@string/permlab_fotaUpdate"

        android:description="@string/permdesc_fotaUpdate"

    <!-- Allows an application to publish system-level services.  Such services

         can only be published from processes that never go away, so this is

         not something that any normal application can do. -->

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

        android:label="@string/permlab_addSystemService"

        android:description="@string/permdesc_addSystemService"

        android:protectionLevel="signature" />



    <!-- Allows an application to update device statistics. Not for

packages/SettingsProvider/AndroidManifest.xml

+0 −6
Original line number Diff line number Diff line
@@ -2,12 +2,6 @@ 
        package="com.android.providers.settings"

        android:sharedUserId="android.uid.system">



    <!-- Permission to write Gservices in SettingsProvider -->

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

        android:label="@string/permlab_writeGservices"

        android:description="@string/permdesc_writeGservices"

        android:protectionLevel="signature" />



    <application android:allowClearUserData="false"

                 android:label="Settings Storage"

                 android:icon="@drawable/ic_launcher_settings">