Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ec06d7b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 9c62f074 c7391622

services/core/java/com/android/server/notification/SnoozeHelper.java

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto;

import com.android.internal.util.XmlUtils;

import com.android.server.pm.PackageManagerService;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -463,6 +464,7 @@ public class SnoozeHelper { 
        return PendingIntent.getBroadcast(mContext,

                REQUEST_CODE_REPOST,

                new Intent(REPOST_ACTION)

                        .setPackage(PackageManagerService.PLATFORM_PACKAGE_NAME)

                        .setData(new Uri.Builder().scheme(REPOST_SCHEME).appendPath(key).build())

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND)

                        .putExtra(EXTRA_KEY, key)

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

+12 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import androidx.test.runner.AndroidJUnit4; 


import com.android.internal.util.FastXmlSerializer;

import com.android.server.UiServiceTestCase;

import com.android.server.pm.PackageManagerService;



import org.junit.Before;

import org.junit.Test;
@@ -256,6 +257,17 @@ public class SnoozeHelperTest extends UiServiceTestCase { 
                UserHandle.USER_SYSTEM, r.getSbn().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

    public void testSnooze() throws Exception {

        NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM);