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

Merge "Add pkg target to snoozing alarm" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-03 03:38:11 +00:00
committed by Android (Google) Code Review
parent 7905a07048 b341523840
commit 691b6ca55b
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/notification/SnoozeHelper.java
View File

@@ -309,6 +309,7 @@ public class SnoozeHelper {
return PendingIntent.getBroadcast(mContext, return PendingIntent.getBroadcast(mContext,
REQUEST_CODE_REPOST, REQUEST_CODE_REPOST,
new Intent(REPOST_ACTION) new Intent(REPOST_ACTION)
.setPackage("android")
.setData(new Uri.Builder().scheme(REPOST_SCHEME).appendPath(key).build()) .setData(new Uri.Builder().scheme(REPOST_SCHEME).appendPath(key).build())
.addFlags(Intent.FLAG_RECEIVER_FOREGROUND) .addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
.putExtra(EXTRA_KEY, key) .putExtra(EXTRA_KEY, key)

11
services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java
View File

@@ -46,6 +46,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import com.android.server.UiServiceTestCase; import com.android.server.UiServiceTestCase;
import com.android.server.pm.PackageManagerService;
@SmallTest @SmallTest
@@ -80,6 +81,16 @@ public class SnoozeHelperTest extends UiServiceTestCase {
UserHandle.USER_SYSTEM, r.sbn.getPackageName(), r.getKey())); UserHandle.USER_SYSTEM, r.sbn.getPackageName(), r.getKey()));
} }
@Test
public void testSnoozeSentToAndroid() throws Exception {
NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM);
mSnoozeHelper.snooze(r, 1000);
ArgumentCaptor<PendingIntent> captor = ArgumentCaptor.forClass(PendingIntent.class);
verify(mAm, times(1)).setExactAndAllowWhileIdle(
anyInt(), anyLong(), captor.capture());
assertEquals("android", captor.getValue().getIntent().getPackage());
}
@Test @Test
public void testSnooze() throws Exception { public void testSnooze() throws Exception {
NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM); NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM);