From 6593cf1f0d561b0f6568b4107849474dae74a0f3 Mon Sep 17 00:00:00 2001 From: WyattRiley Date: Sat, 23 Jun 2018 10:37:48 -0700 Subject: Remove unused SMS & WAP intent filters These intent filters are no longer listened to since Oreo, so removing their setup. Bug: 110925879 Test: Build & GPS sanity check on Pixel 2 Change-Id: Ie6e9e0ecf5d42d250a37a1d89245cb088cca75fa --- .../server/location/GnssLocationProvider.java | 24 +--------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java index 86ecd12f2a4a..4edd48f5ee08 100644 --- a/services/core/java/com/android/server/location/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/GnssLocationProvider.java @@ -68,7 +68,6 @@ import android.os.WorkSource; import android.os.WorkSource.WorkChain; import android.provider.Settings; import android.provider.Telephony.Carriers; -import android.provider.Telephony.Sms.Intents; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener; @@ -2402,28 +2401,7 @@ public class GnssLocationProvider implements LocationProviderInterface, InjectNt .addOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener); // listen for events - IntentFilter intentFilter; - if (native_is_agps_ril_supported()) { - intentFilter = new IntentFilter(); - intentFilter.addAction(Intents.DATA_SMS_RECEIVED_ACTION); - intentFilter.addDataScheme("sms"); - intentFilter.addDataAuthority("localhost", "7275"); - mContext.registerReceiver(mBroadcastReceiver, intentFilter, null, this); - - intentFilter = new IntentFilter(); - intentFilter.addAction(Intents.WAP_PUSH_RECEIVED_ACTION); - try { - intentFilter.addDataType("application/vnd.omaloc-supl-init"); - } catch (IntentFilter.MalformedMimeTypeException e) { - Log.w(TAG, "Malformed SUPL init mime type"); - } - mContext.registerReceiver(mBroadcastReceiver, intentFilter, null, this); - } else if (DEBUG) { - Log.d(TAG, "Skipped registration for SMS/WAP-PUSH messages because AGPS Ril in GPS" - + " HAL is not supported"); - } - - intentFilter = new IntentFilter(); + IntentFilter intentFilter = new IntentFilter(); intentFilter.addAction(ALARM_WAKEUP); intentFilter.addAction(ALARM_TIMEOUT); intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED); -- cgit v1.2.3-59-g8ed1b