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

Commit f563c31c authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Add method to get blocked app count" into pi-dev 

am: 5d1db91e

Change-Id: I727f62d74e135c4dd3d991b110ebf4ac6d5698f5
parents 924102ab 5d1db91e

core/java/android/app/INotificationManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ interface INotificationManager 
    ParceledListSlice getNotificationChannelGroups(String pkg);

    boolean onlyHasDefaultChannel(String pkg, int uid);

    ParceledListSlice getRecentNotifyingAppsForUser(int userId);

    int getBlockedAppCount(int userId);



    // TODO: Remove this when callers have been migrated to the equivalent

    // INotificationListener method.

services/core/java/com/android/server/notification/NotificationManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -2393,6 +2393,12 @@ public class NotificationManagerService extends SystemService { 
            }

        }



        @Override

        public int getBlockedAppCount(int userId) {

            checkCallerIsSystem();

            return mRankingHelper.getBlockedAppCount(userId);

        }



        @Override

        public void clearData(String packageName, int uid, boolean fromApp) throws RemoteException {

            checkCallerIsSystem();

services/core/java/com/android/server/notification/RankingHelper.java

+15 −0
Original line number Diff line number Diff line
@@ -1011,6 +1011,21 @@ public class RankingHelper implements RankingConfig { 
        return blockedCount;

    }



    public int getBlockedAppCount(int userId) {

        int count = 0;

        synchronized (mRecords) {

            final int N = mRecords.size();

            for (int i = 0; i < N; i++) {

                final Record r = mRecords.valueAt(i);

                if (userId == UserHandle.getUserId(r.uid)

                        && r.importance == IMPORTANCE_NONE) {

                    count++;

                }

            }

        }

        return count;

    }



    /**

     * Sets importance.

     */

services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java

+20 −0
Original line number Diff line number Diff line
@@ -1733,4 +1733,24 @@ public class RankingHelperTest extends UiServiceTestCase { 
        mHelper.createNotificationChannel(PKG, 1000, update, true, false);

        assertFalse(mHelper.getNotificationChannel(PKG, 1000, "A", false).canBypassDnd());

    }



    @Test

    public void testGetBlockedAppCount_noApps() {

        assertEquals(0, mHelper.getBlockedAppCount(0));

    }



    @Test

    public void testGetBlockedAppCount_noAppsForUserId() {

        mHelper.setEnabled(PKG, 100, false);

        assertEquals(0, mHelper.getBlockedAppCount(9));

    }



    @Test

    public void testGetBlockedAppCount_appsForUserId() {

        mHelper.setEnabled(PKG, 1020, false);

        mHelper.setEnabled(PKG, 1030, false);

        mHelper.setEnabled(PKG, 1060, false);

        mHelper.setEnabled(PKG, 1000, true);

        assertEquals(3, mHelper.getBlockedAppCount(0));

    }

}