Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix people widget crash" into udc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2023-06-06 14:32:06 +00:00
committed by Android (Google) Code Review
parent 92f213c2b9 4417aa08ed
commit 2c9783b3f0
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetManager.java
View File

@@ -775,10 +775,14 @@ public class PeopleSpaceWidgetManager {
NotificationChannel channel, NotificationChannel channel,
int modificationType) { int modificationType) {
if (channel.isConversation()) { if (channel.isConversation()) {
mBgExecutor.execute(() -> {
if (mUserManager.isUserUnlocked(user)) {
updateWidgets(mAppWidgetManager.getAppWidgetIds( updateWidgets(mAppWidgetManager.getAppWidgetIds(
new ComponentName(mContext, PeopleSpaceWidgetProvider.class) new ComponentName(mContext, PeopleSpaceWidgetProvider.class)
)); ));
} }
});
}
} }
}; };

23
packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java
View File

@@ -481,6 +481,8 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase {
int[] widgetIdsArray = {1}; int[] widgetIdsArray = {1};
when(mAppWidgetManager.getAppWidgetIds(any())).thenReturn(widgetIdsArray); when(mAppWidgetManager.getAppWidgetIds(any())).thenReturn(widgetIdsArray);
when(mUserManager.isUserUnlocked(any())).thenReturn(true);
NotificationChannel channel = NotificationChannel channel =
new NotificationChannel(TEST_CHANNEL_ID, TEST_CHANNEL_NAME, IMPORTANCE_DEFAULT); new NotificationChannel(TEST_CHANNEL_ID, TEST_CHANNEL_NAME, IMPORTANCE_DEFAULT);
channel.setConversationId(TEST_PARENT_CHANNEL_ID, TEST_CONVERSATION_ID); channel.setConversationId(TEST_PARENT_CHANNEL_ID, TEST_CONVERSATION_ID);
@@ -489,8 +491,25 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase {
UserHandle.getUserHandleForUid(0), channel, IMPORTANCE_HIGH); UserHandle.getUserHandleForUid(0), channel, IMPORTANCE_HIGH);
mClock.advanceTime(MIN_LINGER_DURATION); mClock.advanceTime(MIN_LINGER_DURATION);
verify(mAppWidgetManager, times(1)).updateAppWidget(anyInt(), verify(mAppWidgetManager, times(1)).updateAppWidget(anyInt(), any());
any()); }
@Test
public void testOnNotificationChannelModified_userLocked() {
int[] widgetIdsArray = {1};
when(mAppWidgetManager.getAppWidgetIds(any())).thenReturn(widgetIdsArray);
when(mUserManager.isUserUnlocked(any())).thenReturn(false);
NotificationChannel channel =
new NotificationChannel(TEST_CHANNEL_ID, TEST_CHANNEL_NAME, IMPORTANCE_DEFAULT);
channel.setConversationId(TEST_PARENT_CHANNEL_ID, TEST_CONVERSATION_ID);
mNoMan.issueChannelModification(TEST_PACKAGE_A,
UserHandle.getUserHandleForUid(0), channel, IMPORTANCE_HIGH);
mClock.advanceTime(MIN_LINGER_DURATION);
verify(mAppWidgetManager, never()).updateAppWidget(anyInt(), any());
} }
@Test @Test