diff options
author | Geremy Condra <gcondra@google.com> | 2012-11-02 14:22:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-02 14:22:31 -0700 |
commit | b14c9900cbbaca6361030d8fc8d6515cc9e06e10 (patch) | |
tree | 5550c45f6f7410e9ec9c9451406bce554b3d636d | |
parent | a47776c9f889242b3bcff0ff2d113d50da342262 (diff) | |
parent | a295ba44793e5601c8574bdcb07313420aa6500c (diff) | |
download | frameworks_base-b14c9900cbbaca6361030d8fc8d6515cc9e06e10.zip frameworks_base-b14c9900cbbaca6361030d8fc8d6515cc9e06e10.tar.gz frameworks_base-b14c9900cbbaca6361030d8fc8d6515cc9e06e10.tar.bz2 |
am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
* commit 'a295ba44793e5601c8574bdcb07313420aa6500c':
Change android.permission.SERIAL_PORT to signature|system.
-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 6546fed..9a6b006 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1625,7 +1625,7 @@ <permission android:name="android.permission.SERIAL_PORT" android:label="@string/permlab_serialPort" android:description="@string/permdesc_serialPort" - android:protectionLevel="normal" /> + android:protectionLevel="signature|system" /> <!-- Allows the holder to access content providers from outside an ApplicationThread. This permission is enforced by the ActivityManagerService on the corresponding APIs, |