Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 285d2df5 authored by Zheng Zhang's avatar Zheng Zhang Committed by android-build-merger
Browse files

Merge "Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider" into oc-mr1-dev 

am: 61492c85

Change-Id: I7e3e6413d6edab90ae4ebd38d49aaf6157aed26c
parents aa2c1ef3 61492c85

services/core/java/com/android/server/location/GnssLocationProvider.java

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,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;
@@ -2311,6 +2312,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);