diff options
author | Jeff Brown <jeffbrown@google.com> | 2010-04-08 13:49:55 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-08 13:49:55 -0700 |
commit | a30b596d6ac46d88fd92dd3e1806b5de9b62b10b (patch) | |
tree | 64019b2f5c318c99f8f9b03ff820531403624637 | |
parent | b52e9f748cefaad01fc66a73ddfa707f2446895c (diff) | |
parent | ec7c78fbf526816cd361fd482bdf3792ecfd9a9f (diff) | |
download | frameworks_base-a30b596d6ac46d88fd92dd3e1806b5de9b62b10b.zip frameworks_base-a30b596d6ac46d88fd92dd3e1806b5de9b62b10b.tar.gz frameworks_base-a30b596d6ac46d88fd92dd3e1806b5de9b62b10b.tar.bz2 |
am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
Merge commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f' into froyo-plus-aosp
* commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f':
@hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
-rw-r--r-- | api/current.xml | 22 | ||||
-rw-r--r-- | core/res/AndroidManifest.xml | 6 |
2 files changed, 4 insertions, 24 deletions
diff --git a/api/current.xml b/api/current.xml index 14c529b..99949cf 100644 --- a/api/current.xml +++ b/api/current.xml @@ -34,17 +34,6 @@ visibility="public" > </constructor> -<field name="ACCESS_CACHE_FILESYSTEM" - type="java.lang.String" - transient="false" - volatile="false" - value=""android.permission.ACCESS_CACHE_FILESYSTEM"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="ACCESS_CHECKIN_PROPERTIES" type="java.lang.String" transient="false" @@ -716,17 +705,6 @@ visibility="public" > </field> -<field name="MOVE_PACKAGE" - type="java.lang.String" - transient="false" - volatile="false" - value=""android.permission.MOVE_PACKAGE"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="PERSISTENT_ACTIVITY" type="java.lang.String" transient="false" diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 9e3e8a4..db71b21 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1031,7 +1031,8 @@ android:description="@string/permdesc_deletePackages" android:protectionLevel="signatureOrSystem" /> - <!-- Allows an application to move location of installed package. --> + <!-- Allows an application to move location of installed package. + @hide --> <permission android:name="android.permission.MOVE_PACKAGE" android:label="@string/permlab_movePackage" android:description="@string/permdesc_movePackage" @@ -1207,7 +1208,8 @@ android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="signatureOrSystem" /> - <!-- Allow an application to read and write the cache partition. --> + <!-- Allow an application to read and write the cache partition. + @hide --> <permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM" android:label="@string/permlab_cache_filesystem" android:description="@string/permdesc_cache_filesystem" |