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

Commit 4ed1b2ad authored by Rohan Shah's avatar Rohan Shah
Browse files

[Notif] Cache bool instead of manager/info 

Follow up to ag/3815403

Updated to cache bool instead of manager/info in order to reduce IPC
calls made thru packagemanager.

Also collapsed test setup for shade.

Change-Id: I8fa116b3f24eaa887d2139c0aab1996e3c95fbdc
Fixes: 74115090
Test: Visually & atest for ExpandableNR
parent 1e617f5c

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java

+78 −22
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import android.graphics.drawable.AnimatedVectorDrawable; 
import android.graphics.drawable.AnimationDrawable;

import android.graphics.drawable.AnimationDrawable;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.os.AsyncTask;

import android.os.Build;

import android.os.Build;

import android.os.Bundle;

import android.os.Bundle;

import android.service.notification.StatusBarNotification;

import android.service.notification.StatusBarNotification;
@@ -100,13 +101,17 @@ import java.util.function.Consumer; 
public class ExpandableNotificationRow extends ActivatableNotificationView

public class ExpandableNotificationRow extends ActivatableNotificationView

        implements PluginListener<NotificationMenuRowPlugin> {

        implements PluginListener<NotificationMenuRowPlugin> {





    private static final boolean DEBUG = false;

    private static final int DEFAULT_DIVIDER_ALPHA = 0x29;

    private static final int DEFAULT_DIVIDER_ALPHA = 0x29;

    private static final int COLORED_DIVIDER_ALPHA = 0x7B;

    private static final int COLORED_DIVIDER_ALPHA = 0x7B;

    private static final int MENU_VIEW_INDEX = 0;

    private static final int MENU_VIEW_INDEX = 0;

    private static final String TAG = "ExpandableNotifRow";

    private static final String TAG = "ExpandableNotifRow";





    /**

     * Listener for when {@link ExpandableNotificationRow} is laid out.

     */

    public interface LayoutListener {

    public interface LayoutListener {

        public void onLayout();

        void onLayout();

    }

    }





    private LayoutListener mLayoutListener;

    private LayoutListener mLayoutListener;
@@ -174,8 +179,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    private NotificationGuts mGuts;

    private NotificationGuts mGuts;

    private NotificationData.Entry mEntry;

    private NotificationData.Entry mEntry;

    private StatusBarNotification mStatusBarNotification;

    private StatusBarNotification mStatusBarNotification;

    private PackageManager mCachedPackageManager;

    /**

    private PackageInfo mCachedPackageInfo;

     * Whether or not this row represents a system notification. Note that if this is {@code null},

     * that means we were either unable to retrieve the info or have yet to retrieve the info.

     */

    private Boolean mIsSystemNotification;

    private String mAppName;

    private String mAppName;

    private boolean mIsHeadsUp;

    private boolean mIsHeadsUp;

    private boolean mLastChronometerRunning = true;

    private boolean mLastChronometerRunning = true;
@@ -292,6 +300,33 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    private int mNotificationColorAmbient;

    private int mNotificationColorAmbient;

    private NotificationViewState mNotificationViewState;

    private NotificationViewState mNotificationViewState;





    private SystemNotificationAsyncTask mSystemNotificationAsyncTask =

            new SystemNotificationAsyncTask();



    /**

     * Returns whether the given {@code statusBarNotification} is a system notification.

     * <b>Note</b>, this should be run in the background thread if possible as it makes multiple IPC

     * calls.

     */

    private static Boolean isSystemNotification(

            Context context, StatusBarNotification statusBarNotification) {

        PackageManager packageManager = StatusBar.getPackageManagerForUser(

                context, statusBarNotification.getUser().getIdentifier());

        Boolean isSystemNotification = null;



        try {

            PackageInfo packageInfo = packageManager.getPackageInfo(

                    statusBarNotification.getPackageName(), PackageManager.GET_SIGNATURES);



            isSystemNotification =

                    com.android.settingslib.Utils.isSystemPackage(

                            context.getResources(), packageManager, packageInfo);

        } catch (PackageManager.NameNotFoundException e) {

            Log.e(TAG, "cacheIsSystemNotification: Could not find package info");

        }

        return isSystemNotification;

    }



    @Override

    @Override

    public boolean isGroupExpansionChanging() {

    public boolean isGroupExpansionChanging() {

        if (isChildInGroup()) {

        if (isChildInGroup()) {
@@ -383,21 +418,19 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        mStatusBarNotification = entry.notification;

        mStatusBarNotification = entry.notification;

        mNotificationInflater.inflateNotificationViews();

        mNotificationInflater.inflateNotificationViews();





        perhapsCachePackageInfo();

        cacheIsSystemNotification();

    }

    }





    /**

    /**

     * Caches the package manager and info objects which are expensive to obtain.

     * Caches whether or not this row contains a system notification. Note, this is only cached

     * once per notification as the packageInfo can't technically change for a notification row.

     */

     */

    private void perhapsCachePackageInfo() {

    private void cacheIsSystemNotification() {

        if (mCachedPackageInfo == null) {

        if (mIsSystemNotification == null) {

            mCachedPackageManager = StatusBar.getPackageManagerForUser(

            if (mSystemNotificationAsyncTask.getStatus() == AsyncTask.Status.PENDING) {

                    mContext, mStatusBarNotification.getUser().getIdentifier());

                // Run async task once, only if it hasn't already been executed. Note this is

            try {

                // executed in serial - no need to parallelize this small task.

                mCachedPackageInfo = mCachedPackageManager.getPackageInfo(

                mSystemNotificationAsyncTask.execute();

                        mStatusBarNotification.getPackageName(), PackageManager.GET_SIGNATURES);

            } catch (PackageManager.NameNotFoundException e) {

                Log.e(TAG, "perhapsCachePackageInfo: Could not find package info");

            }

            }

        }

        }

    }

    }
@@ -407,9 +440,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
     * covers multiple channels, or is in a whitelist).

     * covers multiple channels, or is in a whitelist).

     */

     */

    public boolean getIsNonblockable() {

    public boolean getIsNonblockable() {

        boolean isNonblockable;

        boolean isNonblockable = Dependency.get(NotificationBlockingHelperManager.class)



        isNonblockable = Dependency.get(NotificationBlockingHelperManager.class)

                .isNonblockablePackage(mStatusBarNotification.getPackageName());

                .isNonblockablePackage(mStatusBarNotification.getPackageName());





        // Only bother with going through the children if the row is still blockable based on the

        // Only bother with going through the children if the row is still blockable based on the
@@ -418,10 +449,18 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            isNonblockable = getNumUniqueChannels() > 1;

            isNonblockable = getNumUniqueChannels() > 1;

        }

        }





        // Only bother with IPC if the package is still blockable.

        // If the SystemNotifAsyncTask hasn't finished running or retrieved a value, we'll try once

        if (!isNonblockable && mCachedPackageManager != null && mCachedPackageInfo != null) {

        // again, but in-place on the main thread this time. This should rarely ever get called.

            if (com.android.settingslib.Utils.isSystemPackage(

        if (mIsSystemNotification == null) {

                    mContext.getResources(), mCachedPackageManager, mCachedPackageInfo)) {

            if (DEBUG) {

                Log.d(TAG, "Retrieving isSystemNotification on main thread");

            }

            mSystemNotificationAsyncTask.cancel(true /* mayInterruptIfRunning */);

            mIsSystemNotification = isSystemNotification(mContext, mStatusBarNotification);

        }



        if (!isNonblockable && mIsSystemNotification != null) {

            if (mIsSystemNotification) {

                if (mEntry.channel != null

                if (mEntry.channel != null

                        && !mEntry.channel.isBlockableSystem()) {

                        && !mEntry.channel.isBlockableSystem()) {

                    isNonblockable = true;

                    isNonblockable = true;
@@ -2828,4 +2867,21 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
         */

         */

        boolean onClick(View v, int x, int y, MenuItem item);

        boolean onClick(View v, int x, int y, MenuItem item);

    }

    }



    /**

     * Background task for executing IPCs to check if the notification is a system notification. The

     * output is used for both the blocking helper and the notification info.

     */

    private class SystemNotificationAsyncTask extends AsyncTask<Void, Void, Boolean> {



        @Override

        protected Boolean doInBackground(Void... voids) {

            return isSystemNotification(mContext, mStatusBarNotification);

        }



        @Override

        protected void onPostExecute(Boolean result) {

            mIsSystemNotification = result;

        }

    }

}
 
}

packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationBlockingHelperManagerTest.java

+2 −8
Original line number Original line Diff line number Diff line
@@ -65,6 +65,8 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { 
    @Before

    @Before

    public void setUp() {

    public void setUp() {

        mBlockingHelperManager = new NotificationBlockingHelperManager(mContext);

        mBlockingHelperManager = new NotificationBlockingHelperManager(mContext);

        // By default, have the shade visible/expanded.

        mBlockingHelperManager.setNotificationShadeExpanded(1f);





        mHelper = new NotificationTestHelper(mContext);

        mHelper = new NotificationTestHelper(mContext);

        when(mGutsManager.openGuts(

        when(mGutsManager.openGuts(
@@ -115,7 +117,6 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { 
    public void testPerhapsShowBlockingHelper_shown() throws Exception {

    public void testPerhapsShowBlockingHelper_shown() throws Exception {

        ExpandableNotificationRow row = createBlockableRowSpy();

        ExpandableNotificationRow row = createBlockableRowSpy();

        row.getEntry().userSentiment = USER_SENTIMENT_NEGATIVE;

        row.getEntry().userSentiment = USER_SENTIMENT_NEGATIVE;

        mBlockingHelperManager.setNotificationShadeExpanded(1f);





        assertTrue(mBlockingHelperManager.perhapsShowBlockingHelper(row, mMenuRow));

        assertTrue(mBlockingHelperManager.perhapsShowBlockingHelper(row, mMenuRow));
@@ -127,7 +128,6 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { 
    public void testPerhapsShowBlockingHelper_shownForLargeGroup() throws Exception {

    public void testPerhapsShowBlockingHelper_shownForLargeGroup() throws Exception {

        ExpandableNotificationRow groupRow = createBlockableGroupRowSpy(10);

        ExpandableNotificationRow groupRow = createBlockableGroupRowSpy(10);

        groupRow.getEntry().userSentiment = USER_SENTIMENT_NEGATIVE;

        groupRow.getEntry().userSentiment = USER_SENTIMENT_NEGATIVE;

        mBlockingHelperManager.setNotificationShadeExpanded(1f);





        assertTrue(mBlockingHelperManager.perhapsShowBlockingHelper(groupRow, mMenuRow));

        assertTrue(mBlockingHelperManager.perhapsShowBlockingHelper(groupRow, mMenuRow));
@@ -143,7 +143,6 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { 
        // of the child row.

        // of the child row.

        ExpandableNotificationRow childRow = groupRow.getChildrenContainer().getViewAtPosition(0);

        ExpandableNotificationRow childRow = groupRow.getChildrenContainer().getViewAtPosition(0);

        childRow.getEntry().userSentiment = USER_SENTIMENT_NEGATIVE;

        childRow.getEntry().userSentiment = USER_SENTIMENT_NEGATIVE;

        mBlockingHelperManager.setNotificationShadeExpanded(1f);





        assertTrue(mBlockingHelperManager.perhapsShowBlockingHelper(childRow, mMenuRow));

        assertTrue(mBlockingHelperManager.perhapsShowBlockingHelper(childRow, mMenuRow));
@@ -154,7 +153,6 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { 
    public void testPerhapsShowBlockingHelper_notShownDueToNeutralUserSentiment() throws Exception {

    public void testPerhapsShowBlockingHelper_notShownDueToNeutralUserSentiment() throws Exception {

        ExpandableNotificationRow row = createBlockableRowSpy();

        ExpandableNotificationRow row = createBlockableRowSpy();

        row.getEntry().userSentiment = USER_SENTIMENT_NEUTRAL;

        row.getEntry().userSentiment = USER_SENTIMENT_NEUTRAL;

        mBlockingHelperManager.setNotificationShadeExpanded(1f);





        assertFalse(mBlockingHelperManager.perhapsShowBlockingHelper(row, mMenuRow));

        assertFalse(mBlockingHelperManager.perhapsShowBlockingHelper(row, mMenuRow));

    }

    }
@@ -164,7 +162,6 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { 
            throws Exception {

            throws Exception {

        ExpandableNotificationRow row = createBlockableRowSpy();

        ExpandableNotificationRow row = createBlockableRowSpy();

        row.getEntry().userSentiment = USER_SENTIMENT_POSITIVE;

        row.getEntry().userSentiment = USER_SENTIMENT_POSITIVE;

        mBlockingHelperManager.setNotificationShadeExpanded(1f);





        assertFalse(mBlockingHelperManager.perhapsShowBlockingHelper(row, mMenuRow));

        assertFalse(mBlockingHelperManager.perhapsShowBlockingHelper(row, mMenuRow));

    }

    }
@@ -184,7 +181,6 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { 
        ExpandableNotificationRow row = createBlockableRowSpy();

        ExpandableNotificationRow row = createBlockableRowSpy();

        when(row.getIsNonblockable()).thenReturn(true);

        when(row.getIsNonblockable()).thenReturn(true);

        row.getEntry().userSentiment = USER_SENTIMENT_NEGATIVE;

        row.getEntry().userSentiment = USER_SENTIMENT_NEGATIVE;

        mBlockingHelperManager.setNotificationShadeExpanded(1f);





        assertFalse(mBlockingHelperManager.perhapsShowBlockingHelper(row, mMenuRow));

        assertFalse(mBlockingHelperManager.perhapsShowBlockingHelper(row, mMenuRow));

    }

    }
@@ -198,7 +194,6 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { 
        // of the child row.

        // of the child row.

        ExpandableNotificationRow childRow = groupRow.getChildrenContainer().getViewAtPosition(0);

        ExpandableNotificationRow childRow = groupRow.getChildrenContainer().getViewAtPosition(0);

        childRow.getEntry().userSentiment = USER_SENTIMENT_NEGATIVE;

        childRow.getEntry().userSentiment = USER_SENTIMENT_NEGATIVE;

        mBlockingHelperManager.setNotificationShadeExpanded(1f);





        assertFalse(mBlockingHelperManager.perhapsShowBlockingHelper(childRow, mMenuRow));

        assertFalse(mBlockingHelperManager.perhapsShowBlockingHelper(childRow, mMenuRow));

    }

    }
@@ -208,7 +203,6 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { 
        ExpandableNotificationRow row = spy(createBlockableRowSpy());

        ExpandableNotificationRow row = spy(createBlockableRowSpy());

        row.getEntry().userSentiment = USER_SENTIMENT_NEGATIVE;

        row.getEntry().userSentiment = USER_SENTIMENT_NEGATIVE;

        when(row.isAttachedToWindow()).thenReturn(true);

        when(row.isAttachedToWindow()).thenReturn(true);

        mBlockingHelperManager.setNotificationShadeExpanded(1f);





        // Show check

        // Show check

        assertTrue(mBlockingHelperManager.perhapsShowBlockingHelper(row, mMenuRow));

        assertTrue(mBlockingHelperManager.perhapsShowBlockingHelper(row, mMenuRow));