commit f34dc237b6757bf87acab2cc0d289f0d176782b7
author Tony Mantler <nicoya@google.com> Tue May 26 11:00:31 2015 -0700
committer The Android Automerger <android-build@google.com> Tue May 26 15:17:50 2015 -0700
tree 1b6457d8c0d9fc6f58a553b419e49c0bc0cd57a6
parent ad0d09fc10484f165064f3315d3bb4e728ee20d5

TvSettings should not listen for GMS location intents

Don't respond to com.google.android.gsf.GOOGLE_LOCATION_SETTINGS

b/18337371

Change-Id: I491fa8c4deb80435d12c0c96acf8f322ac23bef8

Settings/AndroidManifest.xml

diff --git a/Settings/AndroidManifest.xml b/Settings/AndroidManifest.xml
index 38fee48..e91ad97 100644
--- a/Settings/AndroidManifest.xml
+++ b/Settings/AndroidManifest.xml
@@ -305,12 +305,6 @@
             android:configChanges="keyboard|keyboardHidden|navigation"
             android:exported="true" >
             <intent-filter>
-                <action android:name="com.google.android.gsf.GOOGLE_LOCATION_SETTINGS" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
-            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />