From 511837fdcd46a0d9d21ccd5ecf8dab49b60413f9 Mon Sep 17 00:00:00 2001 From: Kate Montgomery Date: Mon, 14 Feb 2022 21:10:18 +0000 Subject: [PATCH] Do not display the indicator on high power location requests with the new behavior. Bug: 191503437 Test: atest LocationControllerImplTest Change-Id: Id66b08bccea0cb9aa5b1fbdeb525dc9f57921e48 --- .../systemui/statusbar/policy/LocationControllerImpl.java | 2 +- .../statusbar/policy/LocationControllerImplTest.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java index 5e91a2571bc35..f52c6ed0a2328 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java @@ -272,7 +272,7 @@ public class LocationControllerImpl extends BroadcastReceiver implements Locatio } boolean highPowerOp = areActiveHighPowerLocationRequests(); - mAreActiveLocationRequests = highPowerOp || shouldDisplay; + mAreActiveLocationRequests = shouldDisplay; if (mAreActiveLocationRequests != hadActiveLocationRequests) { mHandler.sendEmptyMessage(H.MSG_LOCATION_ACTIVE_CHANGED); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/LocationControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/LocationControllerImplTest.java index f5554c585c233..9f9cb409009fe 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/LocationControllerImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/LocationControllerImplTest.java @@ -205,6 +205,12 @@ public class LocationControllerImplTest extends SysuiTestCase { mTestableLooper.processAllMessages(); verify(callback, times(1)).onLocationActiveChanged(false); + + when(mAppOpsController.getActiveAppOps()).thenReturn(ImmutableList.of()); + mLocationController.onActiveStateChanged(AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION, 0, + "com.google.android.googlequicksearchbox", true); + mTestableLooper.processAllMessages(); + verify(callback, times(1)).onLocationActiveChanged(true); } @Test