Disable AppOps for real.
Change-Id: I1a952dfd2b32566c2f64367dd9698a94410ec7c1
Conflicts:
AndroidManifest.xml
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 67aa7ee..713a1b6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -794,6 +794,7 @@
android:value="com.android.settings.NotificationStation" />
</activity>
+ <!--
<activity android:name="Settings$AppOpsSummaryActivity"
android:label="@string/app_ops_settings"
android:taskAffinity=""
@@ -802,18 +803,16 @@
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.APP_OPS_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
- <!-- Not yet ready to expose.
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="com.android.settings.SHORTCUT" />
- -->
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.AppOpsSummary" />
- <!--
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
- android:resource="@id/application_settings" /> -->
+ android:resource="@id/application_settings" />
</activity>
-
+ -->
+
<activity android:name="Settings$LocationSettingsActivity"
android:label="@string/location_settings_title"
android:configChanges="orientation|keyboardHidden|screenSize"