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

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

Add tracing for notification history actions 

Test: perform actions in UI
Fixes: 142387395
Change-Id: Ia586b8f015599b3a03d1d4d892f3258f93f11343
parent 27e26448

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

+39 −14
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ import android.os.ServiceManager; 
import android.os.ShellCallback;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.Trace;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.VibrationEffect;
@@ -2263,12 +2264,26 @@ public class NotificationManagerService extends SystemService { 


    @Override

    public void onUnlockUser(@NonNull UserInfo userInfo) {

        mHandler.post(() -> mHistoryManager.onUserUnlocked(userInfo.id));

        mHandler.post(() -> {

            Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "notifHistoryUnlockUser");

            try {

                mHistoryManager.onUserUnlocked(userInfo.id);

            } finally {

                Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

            }

        });

    }



    @Override

    public void onStopUser(@NonNull UserInfo userInfo) {

        mHandler.post(() -> mHistoryManager.onUserStopped(userInfo.id));

        mHandler.post(() -> {

            Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "notifHistoryStopUser");

            try {

                mHistoryManager.onUserStopped(userInfo.id);

            } finally {

                Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

            }

        });

    }



    @GuardedBy("mNotificationLock")
@@ -2595,6 +2610,8 @@ public class NotificationManagerService extends SystemService { 
            mAppUsageStats.reportInterruptiveNotification(r.getSbn().getPackageName(),

                    r.getChannel().getId(),

                    getRealUserId(r.getSbn().getUserId()));

            Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "notifHistoryAddItem");

            try {

                mHistoryManager.addNotification(new HistoricalNotification.Builder()

                        .setPackage(r.getSbn().getPackageName())

                        .setUid(r.getSbn().getUid())
@@ -2606,6 +2623,9 @@ public class NotificationManagerService extends SystemService { 
                                r.getSbn().getPackageContext(getContext()), r.getNotification()))

                        .setIcon(r.getNotification().getSmallIcon())

                        .build());

            } finally {

                Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

            }

            r.setRecordedInterruption(true);

        }

    }
@@ -3679,7 +3699,12 @@ public class NotificationManagerService extends SystemService { 
            if (mAppOps.noteOpNoThrow(AppOpsManager.OP_ACCESS_NOTIFICATIONS, uid, callingPkg)

                    == AppOpsManager.MODE_ALLOWED) {

                IntArray currentUserIds = mUserProfiles.getCurrentProfileIds();

                Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "notifHistoryReadHistory");

                try {

                    return mHistoryManager.readNotificationHistory(currentUserIds.toArray());

                } finally {

                    Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

                }

            }

            return new NotificationHistory();

        }