Merge "Fix unit tests for people service." into rvc-dev

3 files changed, 11 insertions, 7 deletions

diff --git a/services/people/java/com/android/server/people/data/AggregateEventHistoryImpl.java b/services/people/java/com/android/server/people/data/AggregateEventHistoryImpl.java
index 4ac346b51b22..6abf6d256caf 100644
--- a/services/people/java/com/android/server/people/data/AggregateEventHistoryImpl.java
+++ b/services/people/java/com/android/server/people/data/AggregateEventHistoryImpl.java
@@ -42,14 +42,16 @@ class AggregateEventHistoryImpl implements EventHistory {
     @NonNull
     @Override
     public EventIndex getEventIndex(Set<Integer> eventTypes) {
-        EventIndex merged = new EventIndex();
+        EventIndex merged = null;
         for (EventHistory eventHistory : mEventHistoryList) {
             EventIndex eventIndex = eventHistory.getEventIndex(eventTypes);
-            if (!eventIndex.isEmpty()) {
+            if (merged == null) {
+                merged = eventIndex;
+            } else if (!eventIndex.isEmpty()) {
                 merged = EventIndex.combine(merged, eventIndex);
             }
         }
-        return merged;
+        return merged != null ? merged : EventIndex.EMPTY;
     }
 
     @NonNull
diff --git a/services/people/java/com/android/server/people/data/ConversationStore.java b/services/people/java/com/android/server/people/data/ConversationStore.java
index 2f2a95cb0a6c..8481e5b916a6 100644
--- a/services/people/java/com/android/server/people/data/ConversationStore.java
+++ b/services/people/java/com/android/server/people/data/ConversationStore.java
@@ -198,7 +198,10 @@ class ConversationStore {
         mLocusIdToShortcutIdMap.clear();
         mNotifChannelIdToShortcutIdMap.clear();
         mPhoneNumberToShortcutIdMap.clear();
-        mConversationInfosProtoDiskReadWriter.deleteConversationsFile();
+        ConversationInfosProtoDiskReadWriter writer = getConversationInfosProtoDiskReadWriter();
+        if (writer != null) {
+            writer.deleteConversationsFile();
+        }
     }
 
     @Nullable
diff --git a/services/people/java/com/android/server/people/data/EventIndex.java b/services/people/java/com/android/server/people/data/EventIndex.java
index 47b620773180..6a13b0e6dd6e 100644
--- a/services/people/java/com/android/server/people/data/EventIndex.java
+++ b/services/people/java/com/android/server/people/data/EventIndex.java
@@ -129,8 +129,7 @@ public class EventIndex {
     }
 
     EventIndex(@NonNull EventIndex from) {
-        this(from.mInjector, Arrays.copyOf(from.mEventBitmaps, TIME_SLOT_TYPES_COUNT),
-                from.mLastUpdatedTime);
+        this(from.mInjector, from.mEventBitmaps, from.mLastUpdatedTime);
     }
 
     @VisibleForTesting
@@ -140,7 +139,7 @@ public class EventIndex {
 
     private EventIndex(@NonNull Injector injector, long[] eventBitmaps, long lastUpdatedTime) {
         mInjector = injector;
-        mEventBitmaps = eventBitmaps;
+        mEventBitmaps = Arrays.copyOf(eventBitmaps, TIME_SLOT_TYPES_COUNT);
         mLastUpdatedTime = lastUpdatedTime;
     }