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

Commit 529201f0 authored by Yuichiro Hanada's avatar Yuichiro Hanada Committed by Android (Google) Code Review
Browse files

Merge "Null check for the return value of getPackagesForOps()" into main

parents 7ba56169 42f21d60

packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -229,6 +229,9 @@ public class AppOpsControllerImpl extends BroadcastReceiver implements AppOpsCon 


    private void fetchCurrentActiveOps() {

        List<AppOpsManager.PackageOps> packageOps = mAppOps.getPackagesForOps(OPS);

        if (packageOps == null) {

            return;

        }

        for (AppOpsManager.PackageOps op : packageOps) {

            for (AppOpsManager.OpEntry entry : op.getOps()) {

                for (Map.Entry<String, AppOpsManager.AttributedOpEntry> attributedOpEntry :

packages/SystemUI/tests/src/com/android/systemui/appops/AppOpsControllerTest.java

+11 −0
Original line number Diff line number Diff line
@@ -180,6 +180,17 @@ public class AppOpsControllerTest extends SysuiTestCase { 
        assertThat(mController.getActiveAppOps()).isEmpty();

    }



    /** Regression test for b/324329757 */

    @Test

    public void startListening_fetchCurrentActive_nullPackageOps() {

        when(mAppOpsManager.getPackagesForOps(AppOpsControllerImpl.OPS)).thenReturn(null);



        mController.setListening(true);

        mBgExecutor.runAllReady();



        assertThat(mController.getActiveAppOps()).isEmpty();

    }



    /** Regression test for b/294104969. */

    @Test

    public void startListening_fetchesCurrentActive_oneActive() {