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

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

Merge changes from topic "presubmit-am-090cf7e478c84477974f163c98e38b8f" into sc-qpr1-dev 

* changes:
  [automerge] [DO NOT MERGE] Prevent RemoteViews crashing SystemUi 2p: c3db1e44
  [DO NOT MERGE] Prevent RemoteViews crashing SystemUi
parents 92a92705 189fdb3d

core/java/android/appwidget/AppWidgetHostView.java

+29 −10
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.content.pm.LauncherActivityInfo; 
import android.content.pm.LauncherApps;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.res.Resources;

import android.graphics.Canvas;

import android.graphics.Color;

import android.graphics.PointF;

import android.graphics.Rect;
@@ -310,6 +311,14 @@ public class AppWidgetHostView extends FrameLayout { 
            super.onLayout(changed, left, top, right, bottom);

        } catch (final RuntimeException e) {

            Log.e(TAG, "Remote provider threw runtime exception, using error view instead.", e);

            handleViewError();

        }

    }



    /**

     * Remove bad view and replace with error message view

     */

    private void handleViewError() {

        removeViewInLayout(mView);

        View child = getErrorView();

        prepareView(child);
@@ -321,7 +330,6 @@ public class AppWidgetHostView extends FrameLayout { 
        mView = child;

        mViewMode = VIEW_MODE_ERROR;

    }

    }



    /**

     * Provide guidance about the size of this widget to the AppWidgetManager. The widths and
@@ -932,4 +940,15 @@ public class AppWidgetHostView extends FrameLayout { 
            reapplyLastRemoteViews();

        }

    }



    @Override

    protected void dispatchDraw(@NonNull Canvas canvas) {

        try {

            super.dispatchDraw(canvas);

        } catch (Exception e) {

            // Catch draw exceptions that may be caused by RemoteViews

            Log.e(TAG, "Drawing view failed: " + e);

            post(this::handleViewError);

        }

    }

}

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

+3 −1
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ import android.widget.ImageView; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.MetricsLogger;

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

import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.util.ContrastColorUtil;

import com.android.internal.widget.CachingIconView;

import com.android.internal.widget.CallLayout;
@@ -1554,7 +1555,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            PeopleNotificationIdentifier peopleNotificationIdentifier,

            OnUserInteractionCallback onUserInteractionCallback,

            Optional<BubblesManager> bubblesManagerOptional,

            NotificationGutsManager gutsManager) {

            NotificationGutsManager gutsManager,

            IStatusBarService statusBarService) {

        mEntry = entry;

        mAppName = appName;

        if (mMenuRow == null) {

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java

+7 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.view.ViewGroup; 


import androidx.annotation.NonNull;



import com.android.internal.statusbar.IStatusBarService;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
@@ -84,6 +85,7 @@ public class ExpandableNotificationRowController implements NodeController { 
    private final boolean mAllowLongPress;

    private final PeopleNotificationIdentifier mPeopleNotificationIdentifier;

    private final Optional<BubblesManager> mBubblesManagerOptional;

    private final IStatusBarService mStatusBarService;



    @Inject

    public ExpandableNotificationRowController(
@@ -109,7 +111,8 @@ public class ExpandableNotificationRowController implements NodeController { 
            FalsingManager falsingManager,

            FalsingCollector falsingCollector,

            PeopleNotificationIdentifier peopleNotificationIdentifier,

            Optional<BubblesManager> bubblesManagerOptional) {

            Optional<BubblesManager> bubblesManagerOptional,

            IStatusBarService statusBarService) {

        mView = view;

        mListContainer = listContainer;

        mActivatableNotificationViewController = activatableNotificationViewController;
@@ -134,6 +137,7 @@ public class ExpandableNotificationRowController implements NodeController { 
        mFalsingCollector = falsingCollector;

        mPeopleNotificationIdentifier = peopleNotificationIdentifier;

        mBubblesManagerOptional = bubblesManagerOptional;

        mStatusBarService = statusBarService;

    }



    /**
@@ -160,7 +164,8 @@ public class ExpandableNotificationRowController implements NodeController { 
                mPeopleNotificationIdentifier,

                mOnUserInteractionCallback,

                mBubblesManagerOptional,

                mNotificationGutsManager

                mNotificationGutsManager,

                mStatusBarService

        );

        mView.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);

        if (mAllowLongPress) {

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java

+39 −0
Original line number Diff line number Diff line
@@ -21,10 +21,13 @@ import android.annotation.Nullable; 
import android.app.Notification;

import android.app.PendingIntent;

import android.content.Context;

import android.graphics.Canvas;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.os.Build;

import android.os.RemoteException;

import android.provider.Settings;

import android.service.notification.StatusBarNotification;

import android.util.ArrayMap;

import android.util.AttributeSet;

import android.util.Log;
@@ -40,6 +43,7 @@ import android.widget.LinearLayout; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.Dependency;

import com.android.internal.statusbar.IStatusBarService;

import com.android.systemui.R;

import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;

import com.android.systemui.statusbar.RemoteInputController;
@@ -125,6 +129,8 @@ public class NotificationContentView extends FrameLayout { 
    private RemoteInputController mRemoteInputController;

    private Runnable mExpandedVisibleListener;

    private PeopleNotificationIdentifier mPeopleIdentifier;

    private IStatusBarService mStatusBarService;



    /**

     * List of listeners for when content views become inactive (i.e. not the showing view).

     */
@@ -178,6 +184,7 @@ public class NotificationContentView extends FrameLayout { 
        mHybridGroupManager = new HybridGroupManager(getContext());

        mSmartReplyConstants = Dependency.get(SmartReplyConstants.class);

        mSmartReplyController = Dependency.get(SmartReplyController.class);

        mStatusBarService = Dependency.get(IStatusBarService.class);

        initView();

    }
@@ -1978,4 +1985,36 @@ public class NotificationContentView extends FrameLayout { 
        }

        return Notification.COLOR_INVALID;

    }



    @Override

    protected void dispatchDraw(Canvas canvas) {

        try {

            super.dispatchDraw(canvas);

        } catch (Exception e) {

            // Catch draw exceptions that may be caused by RemoteViews

            Log.e(TAG, "Drawing view failed: " + e);

            cancelNotification(e);

        }

    }



    private void cancelNotification(Exception exception) {

        try {

            setVisibility(GONE);

            final StatusBarNotification sbn = mNotificationEntry.getSbn();

            if (mStatusBarService != null) {

                // report notification inflation errors back up

                // to notification delegates

                mStatusBarService.onNotificationError(

                        sbn.getPackageName(),

                        sbn.getTag(),

                        sbn.getId(),

                        sbn.getUid(),

                        sbn.getInitialPid(),

                        exception.getMessage(),

                        sbn.getUser().getIdentifier());

            }

        } catch (RemoteException ex) {

            Log.e(TAG, "cancelNotification failed: " + ex);

        }

    }

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationEntryManagerInflationTest.java

+2 −1
Original line number Diff line number Diff line
@@ -265,7 +265,8 @@ public class NotificationEntryManagerInflationTest extends SysuiTestCase { 
                                new FalsingManagerFake(),

                                new FalsingCollectorFake(),

                                mPeopleNotificationIdentifier,

                                Optional.of(mock(BubblesManager.class))

                                Optional.of(mock(BubblesManager.class)),

                                mock(IStatusBarService.class)

                        ));



        when(mNotificationRowComponentBuilder.activatableNotificationView(any()))