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

Commit 61492c85 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents b49fa218 626f3cab

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);