Merge "Fix the NPE when reading the call log or SMS if a device has multiple user profiles" (ef3abba3) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -299,7 +299,8 @@ public class DataManager {

		private void forAllUnlockedUsers(Consumer<UserData> consumer) {
		for (int i = 0; i < mUserDataArray.size(); i++) {
		UserData userData = mUserDataArray.get(i);
		int userId = mUserDataArray.keyAt(i);
		UserData userData = mUserDataArray.get(userId);
		if (userData.isUnlocked()) {
		consumer.accept(userData);
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -263,6 +263,7 @@ public final class DataManagerTest {
		@Test
		public void testContactsChanged() {
		mDataManager.onUserUnlocked(USER_ID_PRIMARY);
		mDataManager.onUserUnlocked(USER_ID_SECONDARY);

		ShortcutInfo shortcut = buildShortcutInfo(TEST_PKG_NAME, USER_ID_PRIMARY, TEST_SHORTCUT_ID,
		buildPerson());
		@@ -289,6 +290,7 @@ public final class DataManagerTest {
		@Test
		public void testNotificationListener() {
		mDataManager.onUserUnlocked(USER_ID_PRIMARY);
		mDataManager.onUserUnlocked(USER_ID_SECONDARY);

		ShortcutInfo shortcut = buildShortcutInfo(TEST_PKG_NAME, USER_ID_PRIMARY, TEST_SHORTCUT_ID,
		buildPerson());
		@@ -341,6 +343,7 @@ public final class DataManagerTest {
		@Test
		public void testCallLogContentObserver() {
		mDataManager.onUserUnlocked(USER_ID_PRIMARY);
		mDataManager.onUserUnlocked(USER_ID_SECONDARY);

		ShortcutInfo shortcut = buildShortcutInfo(TEST_PKG_NAME, USER_ID_PRIMARY, TEST_SHORTCUT_ID,
		buildPerson());
		@@ -368,6 +371,7 @@ public final class DataManagerTest {
		@Test
		public void testMmsSmsContentObserver() {
		mDataManager.onUserUnlocked(USER_ID_PRIMARY);
		mDataManager.onUserUnlocked(USER_ID_SECONDARY);

		ShortcutInfo shortcut = buildShortcutInfo(TEST_PKG_NAME, USER_ID_PRIMARY, TEST_SHORTCUT_ID,
		buildPerson());