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 qt-dev am: 8e75c0526a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676688

Change-Id: I284e21b4bd4fefb1f152e29de57b80aadfc46b1f
This commit is contained in:
TreeHugger Robot
2021-04-27 21:14:18 +00:00
committed by Automerger Merge Worker
parent 21756abd75 8e75c0526a
commit 5079aa86c8
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ import android.util.Slog;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.server.pm.PackageManagerService;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
@@ -333,6 +334,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(PackageManagerService.PLATFORM_PACKAGE_NAME)
.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)

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

@@ -41,6 +41,7 @@ import android.util.IntArray;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.server.UiServiceTestCase; import com.android.server.UiServiceTestCase;
import com.android.server.pm.PackageManagerService;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -81,6 +82,17 @@ 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(PackageManagerService.PLATFORM_PACKAGE_NAME,
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);