diff options
| -rw-r--r-- | api/9.xml | 22 | ||||
| -rw-r--r-- | api/current.xml | 30 | ||||
| -rw-r--r-- | core/java/android/app/Activity.java | 4 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 21 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 14 | ||||
| -rw-r--r-- | data/etc/platform.xml | 2 |
6 files changed, 13 insertions, 80 deletions
@@ -793,17 +793,6 @@ visibility="public" > </field> -<field name="READ_OWNER_DATA" - type="java.lang.String" - transient="false" - volatile="false" - value=""android.permission.READ_OWNER_DATA"" - 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=""android.permission.WRITE_OWNER_DATA"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="WRITE_SECURE_SETTINGS" type="java.lang.String" transient="false" diff --git a/api/current.xml b/api/current.xml index 50e3575..700f69a 100644 --- a/api/current.xml +++ b/api/current.xml @@ -712,7 +712,7 @@ value=""android.permission.PERSISTENT_ACTIVITY"" 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=""android.permission.READ_OWNER_DATA"" - 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=""android.permission.WRITE_OWNER_DATA"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="WRITE_SECURE_SETTINGS" type="java.lang.String" transient="false" @@ -21262,7 +21240,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </method> @@ -213757,7 +213735,7 @@ synchronized="true" static="false" final="false" - deprecated="deprecated" + deprecated="not deprecated" visibility="public" > </method> @@ -214307,7 +214285,7 @@ synchronized="true" static="false" final="false" - deprecated="deprecated" + deprecated="not deprecated" visibility="public" > <parameter name="pluginsPath" type="java.lang.String"> diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 3fe971f..068f821 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1751,6 +1751,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 @@ -1765,6 +1768,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 { diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 1f66d05..2cd38cd 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -193,20 +193,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" @@ -634,7 +620,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" @@ -776,7 +765,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" /> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index e9295f5..e9d799b 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -784,20 +784,6 @@ 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. --> <string name="permdesc_readCalendar">Allows an application to read all diff --git a/data/etc/platform.xml b/data/etc/platform.xml index 0e5df8c..439fc90 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -94,8 +94,6 @@ <assign-permission name="android.permission.CALL_PHONE" uid="shell" /> <assign-permission name="android.permission.READ_CONTACTS" uid="shell" /> <assign-permission name="android.permission.WRITE_CONTACTS" uid="shell" /> - <assign-permission name="android.permission.READ_OWNER_DATA" uid="shell" /> - <assign-permission name="android.permission.WRITE_OWNER_DATA" uid="shell" /> <assign-permission name="android.permission.READ_CALENDAR" uid="shell" /> <assign-permission name="android.permission.WRITE_CALENDAR" uid="shell" /> <assign-permission name="android.permission.READ_USER_DICTIONARY" uid="shell" /> |