From ee7af1329c9fbf80b40cee5eb61c8a52654c35a7 Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Thu, 10 Mar 2022 15:37:19 -0800
Subject: [PATCH] Don't auto-create AppUsageHistory in getBucetExpiryTimeMs().

This method is currently only used by tests but fixing it in case
someone else might use this method in the future.

Bug: 206518483
Test: atest services/tests/servicestests/src/com/android/server/usage/AppIdleHistoryTests.java
Change-Id: Ifa1e26937a6dcd68d5c59a9b84fd4f4e70c6b0f3
---
 .../service/java/com/android/server/usage/AppIdleHistory.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppIdleHistory.java b/apex/jobscheduler/service/java/com/android/server/usage/AppIdleHistory.java
index dd102bdd726e6..e986b1a9bf24d 100644
--- a/apex/jobscheduler/service/java/com/android/server/usage/AppIdleHistory.java
+++ b/apex/jobscheduler/service/java/com/android/server/usage/AppIdleHistory.java
@@ -667,8 +667,8 @@ public class AppIdleHistory {
     long getBucketExpiryTimeMs(String packageName, int userId, int bucket, long elapsedRealtimeMs) {
         ArrayMap<String, AppUsageHistory> userHistory = getUserHistory(userId);
         AppUsageHistory appUsageHistory = getPackageHistory(userHistory, packageName,
-                elapsedRealtimeMs, true);
-        if (appUsageHistory.bucketExpiryTimesMs == null) {
+                elapsedRealtimeMs, false /* create */);
+        if (appUsageHistory == null || appUsageHistory.bucketExpiryTimesMs == null) {
             return 0;
         }
         return appUsageHistory.bucketExpiryTimesMs.get(bucket, 0);