am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread

* commit '1d07b5bc9b0a9e3de4495834242548a600cae1d8':
  Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
This commit is contained in:
Dianne Hackborn
2011-01-26 14:08:30 -08:00
committed by Android Git Automerger

View File

@@ -1077,7 +1077,7 @@
<permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" <permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"
android:label="@string/permlab_changeComponentState" android:label="@string/permlab_changeComponentState"
android:description="@string/permdesc_changeComponentState" android:description="@string/permdesc_changeComponentState"
android:protectionLevel="signature" /> android:protectionLevel="signatureOrSystem" />
<!-- Allows an application to use SurfaceFlinger's low level features --> <!-- Allows an application to use SurfaceFlinger's low level features -->
<permission android:name="android.permission.ACCESS_SURFACE_FLINGER" <permission android:name="android.permission.ACCESS_SURFACE_FLINGER"