Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 90738c2a: Merge "Use private action for SUPL related connectivity changes." into mnc-dr-dev

Browse Source 
* commit '90738c2a7e85cd07ac2cf3ab61246b7745c8fb80':
  Use private action for SUPL related connectivity changes.
This commit is contained in:
Daniel Estrada Alva
2015-09-02 22:13:10 +00:00
committed by Android Git Automerger
parent 967c8816e5 90738c2a7e
commit 1afe952ca1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/location/GpsLocationProvider.java
View File

@@ -444,7 +444,8 @@ public class GpsLocationProvider implements LocationProviderInterface {
checkSmsSuplInit(intent); checkSmsSuplInit(intent);
} else if (action.equals(Intents.WAP_PUSH_RECEIVED_ACTION)) { } else if (action.equals(Intents.WAP_PUSH_RECEIVED_ACTION)) {
checkWapSuplInit(intent); checkWapSuplInit(intent);
} else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) { } else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)
|| action.equals(ConnectivityManager.CONNECTIVITY_ACTION_SUPL)) {
// retrieve NetworkInfo result for this UID // retrieve NetworkInfo result for this UID
NetworkInfo info = NetworkInfo info =
intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO); intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO);
@@ -2049,6 +2050,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
intentFilter.addAction(ALARM_WAKEUP); intentFilter.addAction(ALARM_WAKEUP);
intentFilter.addAction(ALARM_TIMEOUT); intentFilter.addAction(ALARM_TIMEOUT);
intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION_SUPL);
intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED); intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);
intentFilter.addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED); intentFilter.addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED);
intentFilter.addAction(Intent.ACTION_SCREEN_OFF); intentFilter.addAction(Intent.ACTION_SCREEN_OFF);