commit 0b81ce217ea56290f10a301cfca1c9fdce876d43
author Dan Egnor <egnor@google.com> Fri Nov 13 11:33:59 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 13 11:33:59 2009 -0800
tree c73611fbcedb1ade7c5d99f27aefe971a36b06c9
parent fcd2917a3550e2b4f5c6ff2038ae5de91c81d28c
parent 5da824210ee34f051c295c12f6bcc4b617da4a1a

am 5da82421: Merge change Iac63ebc8 into eclair-mr2

Merge commit '5da824210ee34f051c295c12f6bcc4b617da4a1a' into eclair-mr2-plus-aosp

* commit '5da824210ee34f051c295c12f6bcc4b617da4a1a':
  Make WRITE_GSERVICES into system-or-signature (instead of just signature),

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 1c3cf3c..22716b8 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -515,7 +515,7 @@
 
     <!-- Allows an application to modify the Google service map. -->
     <permission android:name="android.permission.WRITE_GSERVICES"
-        android:protectionLevel="signature"
+        android:protectionLevel="signatureOrSystem"
         android:label="@string/permlab_writeGservices"
         android:description="@string/permdesc_writeGservices" />