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

Commit cc2ca4ba authored by Kate Montgomery's avatar Kate Montgomery Committed by Android (Google) Code Review
Browse files

Merge "Do not display the indicator on high power location requests with the new behavior."

parents fc5f85a8 511837fd

packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/LocationControllerImplTest.java

+6 −0
Original line number Diff line number Diff line
@@ -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