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

Commit 68e317c4 authored by Grace Cheng's avatar Grace Cheng
Browse files

Restricts driver assistance location bypass to current user. 

To support concurrent multi user in multi display, we restrict driver
assistance location bypass to current user which is always driver.

Bug: 236139244
Bug: 245357588

Test: atest CtsLocaitonHostTestCases
Test: manually in emulator

Change-Id: I1c47690f525e0084de32faf24d837492976ddf52
parent 64dcbfe4

services/core/java/com/android/server/location/provider/LocationProviderManager.java

+4 −0
Original line number Diff line number Diff line
@@ -661,6 +661,8 @@ public class LocationProviderManager extends 
                if (!GPS_PROVIDER.equals(mName)) {

                    Log.e(TAG, "adas gnss bypass request received in non-gps provider");

                    adasGnssBypass = false;

                } else if (!mUserHelper.isCurrentUserId(getIdentity().getUserId())) {

                    adasGnssBypass = false;

                } else if (!mLocationSettings.getUserSettings(

                        getIdentity().getUserId()).isAdasGnssLocationEnabled()) {

                    adasGnssBypass = false;
@@ -1712,6 +1714,8 @@ public class LocationProviderManager extends 
            if (!GPS_PROVIDER.equals(mName)) {

                Log.e(TAG, "adas gnss bypass request received in non-gps provider");

                adasGnssBypass = false;

            } else if (!mUserHelper.isCurrentUserId(identity.getUserId())) {

                adasGnssBypass = false;

            } else if (!mLocationSettings.getUserSettings(

                    identity.getUserId()).isAdasGnssLocationEnabled()) {

                adasGnssBypass = false;