Merge "Cherry-pick of f5e4f208b9 to honeycomb" into honeycomb

This commit is contained in:
Jason Chen
2011-01-26 15:30:56 -08:00
committed by Android (Google) Code Review

View File

@@ -1095,7 +1095,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"