Merge "Fix unit tests for people service." into rvc-dev am: a23db05da5 (96da6251) · Commits · e / os / android_frameworks_base

services/people/java/com/android/server/people/data/AggregateEventHistoryImpl.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -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

+4 −1

Original line number	Diff line number	Diff line
		@@ -198,7 +198,10 @@ class ConversationStore {
		mLocusIdToShortcutIdMap.clear();
		mNotifChannelIdToShortcutIdMap.clear();
		mPhoneNumberToShortcutIdMap.clear();
		mConversationInfosProtoDiskReadWriter.deleteConversationsFile();
		ConversationInfosProtoDiskReadWriter writer = getConversationInfosProtoDiskReadWriter();
		if (writer != null) {
		writer.deleteConversationsFile();
		}
		}

		@Nullable

+2 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

+15 −7

Original line number	Diff line number	Diff line
		@@ -347,8 +347,7 @@ public final class DataManagerTest {

		mDataManager.reportShareTargetEvent(appTargetEvent, intentFilter);

		List<Range<Long>> activeShareTimeSlots = getActiveSlotsForTestShortcut(
		Event.SHARE_EVENT_TYPES);
		List<Range<Long>> activeShareTimeSlots = getActiveSlotsForAppShares();
		assertEquals(1, activeShareTimeSlots.size());
		}

		@@ -692,8 +691,7 @@ public final class DataManagerTest {
		return conversations;
		}

		private List<Range<Long>> getActiveSlotsForTestShortcut(
		Set<Integer> eventTypes) {
		private List<Range<Long>> getActiveSlotsForTestShortcut(Set<Integer> eventTypes) {
		List<Range<Long>> activeSlots = new ArrayList<>();
		mDataManager.forPackagesInProfile(USER_ID_PRIMARY, packageData ->
		activeSlots.addAll(
		@@ -703,6 +701,16 @@ public final class DataManagerTest {
		return activeSlots;
		}

		private List<Range<Long>> getActiveSlotsForAppShares() {
		List<Range<Long>> activeSlots = new ArrayList<>();
		mDataManager.forPackagesInProfile(USER_ID_PRIMARY, packageData ->
		activeSlots.addAll(
		packageData.getClassLevelEventHistory(TEST_CLASS_NAME)
		.getEventIndex(Event.SHARE_EVENT_TYPES)
		.getActiveTimeSlots()));
		return activeSlots;
		}

		private ShortcutInfo buildShortcutInfo(String packageName, int userId, String id,
		@Nullable Person person) {
		Context mockContext = mock(Context.class);