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

Commit e89ca4a2 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 

am: 75f7c57a

Change-Id: I98fd109be4e512aabcb0c8f4b030ed7a89a6a906
parents 41dbf5ad 75f7c57a

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)*.