commit 3c6f7a33398ab610ec1c734360be092db090fb50
author Barnaby James <bjames@google.com> Fri Sep 05 19:59:20 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 05 19:59:21 2014 +0000
tree 1c76d2b99bad8c3ae377f20fce5e352e0aca7558
parent 9164862936dc439045d35670909385defb281395
parent cec8e2fe78ca9500c59e20de4de34b2e101506ec

Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1790226..fe704a4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -138,18 +138,6 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="AirplaneModeVoiceActivity"
-                android:label="@string/wireless_networks_settings_title"
-                android:theme="@android:style/Theme.Material.Light.Voice"
-                android:exported="true"
-                android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.settings.VOICE_CONTROL_AIRPLANE_MODE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE" />
-            </intent-filter>
-        </activity>
-
         <!-- Top-level settings -->
 
         <activity android:name="Settings$WifiSettingsActivity"