Merge change Ia74e2b5c into eclair-mr2

* changes:
  Switched Settings to use the new Gmail permission name space
This commit is contained in:
Android (Google) Code Review
2009-11-30 10:36:39 -08:00

View File

@@ -2,8 +2,8 @@
package="com.android.settings" package="com.android.settings"
android:sharedUserId="android.uid.system"> android:sharedUserId="android.uid.system">
<uses-permission android:name="com.google.android.providers.gmail.permission.WRITE_GMAIL" /> <uses-permission android:name="com.google.android.gm.permission.WRITE_GMAIL" />
<uses-permission android:name="com.google.android.providers.gmail.permission.READ_GMAIL" /> <uses-permission android:name="com.google.android.gm.permission.READ_GMAIL" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" /> <uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
<uses-permission android:name="android.permission.DEVICE_POWER" /> <uses-permission android:name="android.permission.DEVICE_POWER" />