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

Commit f2f3c222 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Fix NPE with canceled notifs 

Test: TimeToLiveHelperTest
Fixes: 352748547
Flag: com.android.server.notification.all_notifs_need_ttl
Change-Id: Ifaa0a126def532b3c3abacde68d3e60eb6280206
parent 250587ff

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

+9 −6
Original line number Diff line number Diff line
@@ -177,14 +177,17 @@ public class TimeToLiveHelper { 
            if (ACTION.equals(action)) {

                String timeoutKey = null;

                synchronized (mLock) {

                    if (!mKeys.isEmpty()) {

                        Pair<Long, String> earliest = mKeys.first();

                        String key = intent.getStringExtra(EXTRA_KEY);

                        if (!earliest.second.equals(key)) {

                        Slog.wtf(TAG, "Alarm triggered but wasn't the earliest we were tracking");

                            Slog.wtf(TAG,

                                    "Alarm triggered but wasn't the earliest we were tracking");

                        }

                        removeMatchingEntry(key);

                        timeoutKey = earliest.second;

                    }

                }

                mNm.timeoutNotification(timeoutKey);

            }

        }

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

+47 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ import android.app.Notification; 
import android.app.NotificationChannel;

import android.app.NotificationManager;

import android.app.PendingIntent;

import android.content.Intent;

import android.net.Uri;

import android.os.SystemClock;

import android.os.UserHandle;

import android.service.notification.StatusBarNotification;
@@ -36,6 +38,7 @@ import android.testing.TestableLooper; 
import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;

import com.android.server.UiServiceTestCase;

import com.android.server.pm.PackageManagerService;



import org.junit.After;

import org.junit.Before;
@@ -124,6 +127,50 @@ public class TimeToLiveHelperTest extends UiServiceTestCase { 
                .isEqualTo(first.getKey());

    }



    @Test

    public void testTimeoutExpires_notifAlreadyCanceled() {

        NotificationRecord r = getRecord("testTimeoutExpires", 1);



        mHelper.scheduleTimeoutLocked(r, 1);

        mHelper.cancelScheduledTimeoutLocked(r);



        Intent intent = new Intent("com.android.server.notification.TimeToLiveHelper")

                .setPackage(PackageManagerService.PLATFORM_PACKAGE_NAME)

                .setData(new Uri.Builder()

                        .scheme("timeout")

                        .appendPath(r.getKey())

                        .build())

                .putExtra(EXTRA_KEY, r.getKey())

                .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);



        mHelper.mNotificationTimeoutReceiver.onReceive(mContext, intent);



        assertThat(mHelper.mKeys).isEmpty();

    }



    @Test

    public void testTimeoutExpires_laterNotifAlreadyCanceled() {

        NotificationRecord r = getRecord("testTimeoutExpires", 1);

        NotificationRecord r2 = getRecord("testTimeoutExpires", 2);



        mHelper.scheduleTimeoutLocked(r, 1);

        mHelper.scheduleTimeoutLocked(r2, 2);

        mHelper.cancelScheduledTimeoutLocked(r2);



        Intent intent = new Intent("com.android.server.notification.TimeToLiveHelper")

                .setPackage(PackageManagerService.PLATFORM_PACKAGE_NAME)

                .setData(new Uri.Builder()

                        .scheme("timeout")

                        .appendPath(r2.getKey())

                        .build())

                .putExtra(EXTRA_KEY, r2.getKey())

                .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);



        mHelper.mNotificationTimeoutReceiver.onReceive(mContext, intent);



        assertThat(mHelper.mKeys).isEmpty();

    }



    @Test

    public void testTimeout_earlierEntryAddedSecond() {

        NotificationRecord later = getRecord("testTimeoutSecond", 2);