diff options
| author | David Brown <dab@google.com> | 2010-09-15 17:43:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 17:43:34 -0700 |
| commit | b6f8989385bd69e3b6fc56f5a095917f8624ed7e (patch) | |
| tree | 03cd8f0e56638cfa8f2702e883333a927ec2cb58 /core/res/AndroidManifest.xml | |
| parent | 06fb6e07652038c137c6aa29cc0add215370ccaf (diff) | |
| parent | 0237cf2eace5d35410e95f586fd40c3068c94582 (diff) | |
| download | frameworks_base-b6f8989385bd69e3b6fc56f5a095917f8624ed7e.zip frameworks_base-b6f8989385bd69e3b6fc56f5a095917f8624ed7e.tar.gz frameworks_base-b6f8989385bd69e3b6fc56f5a095917f8624ed7e.tar.bz2 | |
am 0237cf2e: am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread
Merge commit '0237cf2eace5d35410e95f586fd40c3068c94582'
* commit '0237cf2eace5d35410e95f586fd40c3068c94582':
Mark MODIFY_PHONE_STATE permission as signatureOrSystem
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 4d02b60..19fdeb8 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -478,7 +478,7 @@ Does not include placing calls. --> <permission android:name="android.permission.MODIFY_PHONE_STATE" android:permissionGroup="android.permission-group.PHONE_CALLS" - android:protectionLevel="dangerous" + android:protectionLevel="signatureOrSystem" android:label="@string/permlab_modifyPhoneState" android:description="@string/permdesc_modifyPhoneState" /> |