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

Commit 75f7c57a authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge "Fix NPE in usage stats manager (recent regression)" into oc-dev 

am: 091050e9

Change-Id: I5da7220aa9f5ff0db999c00881577b160e6b17ba
parents 97fb03ca 091050e9

services/usage/java/com/android/server/usage/UsageStatsService.java

+3 −0
Original line number Diff line number Diff line
@@ -831,6 +831,9 @@ public class UsageStatsService extends SystemService implements 
            final UserUsageStatsService service =

                    getUserDataAndInitializeIfNeededLocked(userId, timeNow);

            List<UsageStats> list = service.queryUsageStats(bucketType, beginTime, endTime);

            if (list == null) {

                return null;

            }



            // Mangle instant app names *using their current state (not whether they were ephemeral

            // when the data was recorded)*.