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

Commit 840f0fec authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am d3efa392: Clean up some permissions. 

Merge commit 'd3efa392' into gingerbread-plus-aosp

* commit 'd3efa392':
  Clean up some permissions.
parents 14d56840 d3efa392

api/9.xml

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

>

</field>

<field name="READ_OWNER_DATA"

 type="java.lang.String"

 transient="false"

 volatile="false"

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

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="READ_PHONE_STATE"

 type="java.lang.String"

 transient="false"
@@ -1233,17 +1222,6 @@ 
 visibility="public"

>

</field>

<field name="WRITE_OWNER_DATA"

 type="java.lang.String"

 transient="false"

 volatile="false"

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

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="WRITE_SECURE_SETTINGS"

 type="java.lang.String"

 transient="false"

api/current.xml

+4 −26
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ 
 value="&quot;android.permission.PERSISTENT_ACTIVITY&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</field>
@@ -793,17 +793,6 @@ 
 visibility="public"

>

</field>

<field name="READ_OWNER_DATA"

 type="java.lang.String"

 transient="false"

 volatile="false"

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

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="READ_PHONE_STATE"

 type="java.lang.String"

 transient="false"
@@ -1233,17 +1222,6 @@ 
 visibility="public"

>

</field>

<field name="WRITE_OWNER_DATA"

 type="java.lang.String"

 transient="false"

 volatile="false"

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

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="WRITE_SECURE_SETTINGS"

 type="java.lang.String"

 transient="false"
@@ -20516,7 +20494,7 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="isPersistent" type="boolean">
@@ -203634,7 +203612,7 @@ 
 synchronized="true"

 static="false"

 final="false"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

>

</method>
@@ -204182,7 +204160,7 @@ 
 synchronized="true"

 static="false"

 final="false"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

>

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

core/java/android/app/Activity.java

+4 −0
Original line number Diff line number Diff line
@@ -1620,6 +1620,9 @@ public class Activity extends ContextThemeWrapper 
    }



    /**

     * @deprecated This functionality will be removed in the future; please do

     * not use.

     *

     * Control whether this activity is required to be persistent.  By default

     * activities are not persistent; setting this to true will prevent the

     * system from stopping this activity or its process when running low on
@@ -1634,6 +1637,7 @@ public class Activity extends ContextThemeWrapper 
     *                     persistent, true if so, false for the normal

     *                     behavior.

     */

    @Deprecated

    public void setPersistent(boolean isPersistent) {

        if (mParent == null) {

            try {

core/res/AndroidManifest.xml

+5 −16
Original line number Diff line number Diff line
@@ -191,20 +191,6 @@ 
        android:label="@string/permlab_writeContacts"

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



    <!-- Allows an application to read the owner's data. -->

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

        android:permissionGroup="android.permission-group.PERSONAL_INFO"

        android:protectionLevel="dangerous"

        android:label="@string/permlab_readOwnerData"

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



    <!-- Allows an application to write (but not read) the owner's data. -->

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

        android:permissionGroup="android.permission-group.PERSONAL_INFO"

        android:protectionLevel="dangerous"

        android:label="@string/permlab_writeOwnerData"

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



    <!-- Allows an application to read the user's calendar data. -->

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

        android:permissionGroup="android.permission-group.PERSONAL_INFO"
@@ -625,7 +611,10 @@ 
        android:label="@string/permlab_setAnimationScale"

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



    <!-- Allow an application to make its activities persistent. -->

    <!-- @deprecated This functionality will be removed in the future; please do

         not use.



         Allow an application to make its activities persistent. -->

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

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="dangerous"
@@ -767,7 +756,7 @@ 
    <!-- Allows applications to disable the keyguard -->

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

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="normal"

        android:protectionLevel="dangerous"

        android:description="@string/permdesc_disableKeyguard"

        android:label="@string/permlab_disableKeyguard" />

core/res/res/values/strings.xml

+0 −14
Original line number Diff line number Diff line
@@ -783,20 +783,6 @@ 
        contact (address) data stored on your phone. Malicious

        applications can use this to erase or modify your contact data.</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_writeOwnerData">write owner data</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_writeOwnerData">Allows an application to modify the

        phone owner data stored on your phone. Malicious

        applications can use this to erase or modify owner data.</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_readOwnerData">read owner data</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_readOwnerData">Allows an application read the

        phone owner data stored on your phone. Malicious

        applications can use this to read phone owner data.</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_readCalendar">read calendar events</string>

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