From d1070407e28233b13ac2d04dd2c0ca58cf8f0534 Mon Sep 17 00:00:00 2001
From: Dave Burke <daveburke@google.com>
Date: Wed, 25 Sep 2013 09:56:58 -0700
Subject: [PATCH 1/1] Disable AppOps for real.

Change-Id: I1a952dfd2b32566c2f64367dd9698a94410ec7c1

Conflicts:
	AndroidManifest.xml
---
 AndroidManifest.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 67aa7eec35..713a1b6150 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"
-- 
2.11.0