Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up some permissions.

Browse Source 
Note that WRITE_OWNER_DATA and READ_OWNER_DATA don't actually appear
to be associated with anything or used by anyone, so they are just
deleted.

Also deprecate the activity API to go in the foreground.  I didn't
realize that was released in the SDK.  It needs to go away.

Change-Id: I96f53702c2c79e4999b6b2c498abb770bd27e03a
This commit is contained in:
Dianne Hackborn
2010-09-01 17:34:12 -07:00
parent bc5ec2f91a
commit d3efa39244
6 changed files with 13 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/9.xml
View File

@@ -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"

30
api/current.xml
View File

@@ -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">
@@ -203586,7 +203564,7 @@
synchronized="true"
static="false"
final="false"
deprecated="deprecated"
deprecated="not deprecated"
visibility="public"
>
</method>
@@ -204134,7 +204112,7 @@
synchronized="true"
static="false"
final="false"
deprecated="deprecated"
deprecated="not deprecated"
visibility="public"
>
<parameter name="pluginsPath" type="java.lang.String">

4
core/java/android/app/Activity.java
View File

@@ -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 {

21
core/res/AndroidManifest.xml
View File

@@ -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" />

14
core/res/res/values/strings.xml
View File

@@ -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. -->

2
data/etc/platform.xml
View File

@@ -90,8 +90,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" />