am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev

* commit 'a295ba44793e5601c8574bdcb07313420aa6500c':
  Change android.permission.SERIAL_PORT to signature|system.
This commit is contained in:
Geremy Condra
2012-11-02 14:22:31 -07:00
committed by Android Git Automerger

View File

@ -1625,7 +1625,7 @@
<permission android:name="android.permission.SERIAL_PORT" <permission android:name="android.permission.SERIAL_PORT"
android:label="@string/permlab_serialPort" android:label="@string/permlab_serialPort"
android:description="@string/permdesc_serialPort" android:description="@string/permdesc_serialPort"
android:protectionLevel="normal" /> android:protectionLevel="signature|system" />
<!-- Allows the holder to access content providers from outside an ApplicationThread. <!-- Allows the holder to access content providers from outside an ApplicationThread.
This permission is enforced by the ActivityManagerService on the corresponding APIs, This permission is enforced by the ActivityManagerService on the corresponding APIs,