commit d5656b6eb1dfecd8abb989d6eafdb35e6ab1b5b1
author John Spurlock <jspurlock@google.com> Mon Apr 13 14:06:15 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 13 14:06:17 2015 +0000
tree 7c62f2f048291f0d3ac0514afe57dffa605e3c7d
parent b21cd50b033baa49ede0136fe1bd7d2aa28bb3b5
parent 9cc770eea75be1e944cc75a7f837d18b54eb9268

Merge "Settings: Remove reference to removed string from manifest."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 66a081d..af9c3b4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2075,23 +2075,6 @@
                        android:resource="@id/security_settings" />
         </activity>
 
-        <activity android:name="Settings$ConditionProviderSettingsActivity"
-                  android:label="@string/manage_condition_providers"
-                  android:taskAffinity="">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.ACTION_CONDITION_PROVIDER_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.notification.ConditionProviderSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                       android:resource="@id/notification_settings" />
-        </activity>
-
         <activity android:name="Settings$NotificationSettingsActivity"
                 android:label="@string/notification_settings"
                 android:exported="true"