diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:51:23 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:51:23 -0800 |
| commit | b798689749c64baba81f02e10cf2157c747d6b46 (patch) | |
| tree | da394a395ddb1a6cf69193314846b03fe47a397e /data/etc | |
| parent | f013e1afd1e68af5e3b868c26a653bbfb39538f8 (diff) | |
| download | frameworks_base-b798689749c64baba81f02e10cf2157c747d6b46.zip frameworks_base-b798689749c64baba81f02e10cf2157c747d6b46.tar.gz frameworks_base-b798689749c64baba81f02e10cf2157c747d6b46.tar.bz2 | |
auto import from //branches/cupcake/...@125939
Diffstat (limited to 'data/etc')
| -rw-r--r-- | data/etc/Android.mk | 8 | ||||
| -rw-r--r-- | data/etc/platform.xml (renamed from data/etc/permissions.xml) | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/data/etc/Android.mk b/data/etc/Android.mk index fe4a222..4b5464f 100644 --- a/data/etc/Android.mk +++ b/data/etc/Android.mk @@ -19,14 +19,16 @@ LOCAL_PATH := $(my-dir) ######################## include $(CLEAR_VARS) -LOCAL_MODULE := permissions.xml +LOCAL_MODULE := platform.xml LOCAL_MODULE_TAGS := user development -# This will install the file in /system/etc -# LOCAL_MODULE_CLASS := ETC +# This will install the file in /system/etc/permissions +# +LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions + LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) diff --git a/data/etc/permissions.xml b/data/etc/platform.xml index bdaefff..21e452e 100644 --- a/data/etc/permissions.xml +++ b/data/etc/platform.xml @@ -87,6 +87,7 @@ <assign-permission name="android.permission.SET_ANIMATION_SCALE" uid="shell" /> <assign-permission name="android.permission.SET_PREFERRED_APPLICATIONS" uid="shell" /> <assign-permission name="android.permission.WRITE_SETTINGS" uid="shell" /> + <assign-permission name="android.permission.WRITE_SECURE_SETTINGS" uid="shell" /> <assign-permission name="android.permission.BROADCAST_STICKY" uid="shell" /> <!-- Development tool permissions granted to the shell. --> <assign-permission name="android.permission.SET_DEBUG_APP" uid="shell" /> @@ -116,15 +117,11 @@ <!-- This is a list of all the libraries available for application code to link against. --> - <library name="com.google.android.maps" - file="/system/framework/com.google.android.maps.jar" /> - <library name="com.google.android.gtalkservice" - file="/system/framework/com.google.android.gtalkservice.jar" /> <library name="android.awt" file="/system/framework/android.awt.jar" /> <library name="android.test.runner" file="/system/framework/android.test.runner.jar" /> <library name="com.android.im.plugin" - file="/system/framework/com.android.im.plugin.jar"/> + file="/system/framework/com.android.im.plugin.jar"/> </permissions> |