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

Commit 551f53de authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Closes file descriptor after loading ranking map" into udc-qpr-dev

parents 4b5d78bb a2540498

core/java/android/service/notification/NotificationRankingUpdate.java

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ public class NotificationRankingUpdate implements Parcelable { 
                mapParcel.recycle();

                if (buffer != null) {

                    mRankingMapFd.unmap(buffer);

                    mRankingMapFd.close();

                }

            }

        } else {

core/tests/coretests/src/android/service/notification/NotificationRankingUpdateTest.java

+5 −1
Original line number Diff line number Diff line
@@ -136,7 +136,11 @@ public class NotificationRankingUpdateTest { 
        NotificationListenerService.RankingMap retrievedRankings =

                retrievedRankingUpdate.getRankingMap();

        assertNotNull(retrievedRankings);

        // The rankingUpdate file descriptor is only non-null in the new path.

        if (SystemUiSystemPropertiesFlags.getResolver().isEnabled(

                SystemUiSystemPropertiesFlags.NotificationFlags.RANKING_UPDATE_ASHMEM)) {

            assertTrue(retrievedRankingUpdate.isFdNotNullAndClosed());

        }

        NotificationListenerService.Ranking retrievedRanking =

                new NotificationListenerService.Ranking();

        assertTrue(retrievedRankings.getRanking(TEST_KEY, retrievedRanking));