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

DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider

Browse Source 
TRANSPORT_BLUETOOTH is a essential network type for wearable device.

For non-master branch, only listen to Bluetooth on wearable device.

Bug: 64881794

Test: Trigger Bluetooth on/off on watch, check if UpdateNetworkState()
got called.

Change-Id: I30e39943220597987320ea7843d7d36827fdd0c7
(cherry picked from commit d6886710b5)
This commit is contained in:
Zheng Zhang
2017-08-22 10:27:14 -07:00
parent 63a04f0d8c
commit 03c0f16f37
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/location/GnssLocationProvider.java
View File

@@ -30,6 +30,7 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.hardware.location.GeofenceHardware;
import android.hardware.location.GeofenceHardwareImpl;
@@ -2250,6 +2251,12 @@ public class GnssLocationProvider implements LocationProviderInterface {
NetworkRequest.Builder networkRequestBuilder = new NetworkRequest.Builder();
networkRequestBuilder.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
networkRequestBuilder.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
// On watches, Bluetooth is the most important network type.
boolean isWatch =
mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH);
if (isWatch) {
networkRequestBuilder.addTransportType(NetworkCapabilities.TRANSPORT_BLUETOOTH);
}
NetworkRequest networkRequest = networkRequestBuilder.build();
mConnMgr.registerNetworkCallback(networkRequest, mNetworkConnectivityCallback);