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

Commit 2b041061 authored by Aran Ink's avatar Aran Ink Committed by Android (Google) Code Review
Browse files

Merge "Track and destroy inline URI grants separately from Notification URIs."

parents a3399674 979c9766

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.net.Uri; 
import android.content.ComponentName;

import android.graphics.Rect;

import android.os.Bundle;

import android.os.UserHandle;

import android.service.notification.StatusBarNotification;

import android.hardware.biometrics.IBiometricServiceReceiverInternal;
@@ -78,7 +79,8 @@ interface IStatusBarService 
    void onNotificationSettingsViewed(String key);

    void setSystemUiVisibility(int displayId, int vis, int mask, String cause);

    void onNotificationBubbleChanged(String key, boolean isBubble);

    void grantInlineReplyUriPermission(String key, in Uri uri);

    void grantInlineReplyUriPermission(String key, in Uri uri, in UserHandle user, String packageName);

    void clearInlineReplyUriPermissions(String key);



    void onGlobalActionsShown();

    void onGlobalActionsHidden();

packages/CarSystemUI/src/com/android/systemui/CarSystemUIBinder.java

+4 −1
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController; 
import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.statusbar.policy.NetworkController;

import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;

import com.android.systemui.statusbar.policy.RemoteInputUriController;

import com.android.systemui.statusbar.policy.UserSwitcherController;

import com.android.systemui.statusbar.policy.ZenModeController;

import com.android.systemui.statusbar.tv.TvStatusBar;
@@ -290,7 +291,8 @@ public abstract class CarSystemUIBinder { 
            DozeScrimController dozeScrimController,

            CommandQueue commandQueue,

            PluginManager pluginManager,

            CarNavigationBarController carNavigationBarController) {

            CarNavigationBarController carNavigationBarController,

            RemoteInputUriController remoteInputUriController) {

        return new CarStatusBar(

                context,

                featureFlags,
@@ -357,6 +359,7 @@ public abstract class CarSystemUIBinder { 
                dozeScrimController,

                commandQueue,

                pluginManager,

                remoteInputUriController,

                carNavigationBarController);

    }

}

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+4 −2
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController; 
import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.statusbar.policy.NetworkController;

import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;

import com.android.systemui.statusbar.policy.RemoteInputUriController;

import com.android.systemui.statusbar.policy.UserSwitcherController;

import com.android.systemui.statusbar.policy.ZenModeController;

import com.android.systemui.util.InjectionInflationController;
@@ -301,7 +302,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            DozeScrimController dozeScrimController,

            CommandQueue commandQueue,

            PluginManager pluginManager,



            RemoteInputUriController remoteInputUriController,

            /* Car Settings injected components. */

            CarNavigationBarController carNavigationBarController) {

        super(
@@ -370,7 +371,8 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                powerManager,

                dozeScrimController,

                commandQueue,

                pluginManager);

                pluginManager,

                remoteInputUriController);

        mScrimController = scrimController;

        mCarNavigationBarController = carNavigationBarController;

    }

packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java

+5 −2
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController; 
import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.statusbar.policy.NetworkController;

import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;

import com.android.systemui.statusbar.policy.RemoteInputUriController;

import com.android.systemui.statusbar.policy.UserSwitcherController;

import com.android.systemui.statusbar.policy.ZenModeController;

import com.android.systemui.statusbar.tv.TvStatusBar;
@@ -287,7 +288,8 @@ public abstract class SystemUIBinder { 
            PowerManager powerManager,

            DozeScrimController dozeScrimController,

            CommandQueue commandQueue,

            PluginManager pluginManager) {

            PluginManager pluginManager,

            RemoteInputUriController remoteInputUriController) {

        return new StatusBar(

                context,

                featureFlags,
@@ -354,7 +356,8 @@ public abstract class SystemUIBinder { 
                powerManager,

                dozeScrimController,

                commandQueue,

                pluginManager);

                pluginManager,

                remoteInputUriController);

    }



}

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

+6 −2
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry. 
import com.android.systemui.statusbar.notification.logging.NotificationLogger;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.phone.ShadeController;

import com.android.systemui.statusbar.policy.RemoteInputUriController;

import com.android.systemui.statusbar.policy.RemoteInputView;



import java.io.FileDescriptor;
@@ -121,6 +122,7 @@ public class NotificationRemoteInputManager implements Dumpable { 
    private final UserManager mUserManager;

    private final KeyguardManager mKeyguardManager;

    private final StatusBarStateController mStatusBarStateController;

    private final RemoteInputUriController mRemoteInputUriController;



    protected RemoteInputController mRemoteInputController;

    protected NotificationLifetimeExtender.NotificationSafeToRemoveCallback
@@ -260,7 +262,8 @@ public class NotificationRemoteInputManager implements Dumpable { 
            NotificationEntryManager notificationEntryManager,

            Lazy<ShadeController> shadeController,

            StatusBarStateController statusBarStateController,

            @MainHandler Handler mainHandler) {

            @MainHandler Handler mainHandler,

            RemoteInputUriController remoteInputUriController) {

        mContext = context;

        mLockscreenUserManager = lockscreenUserManager;

        mSmartReplyController = smartReplyController;
@@ -273,6 +276,7 @@ public class NotificationRemoteInputManager implements Dumpable { 
        addLifetimeExtenders();

        mKeyguardManager = context.getSystemService(KeyguardManager.class);

        mStatusBarStateController = statusBarStateController;

        mRemoteInputUriController = remoteInputUriController;



        notificationEntryManager.addNotificationEntryListener(new NotificationEntryListener() {

            @Override
@@ -300,7 +304,7 @@ public class NotificationRemoteInputManager implements Dumpable { 
    /** Initializes this component with the provided dependencies. */

    public void setUpWithCallback(Callback callback, RemoteInputController.Delegate delegate) {

        mCallback = callback;

        mRemoteInputController = new RemoteInputController(delegate);

        mRemoteInputController = new RemoteInputController(delegate, mRemoteInputUriController);

        mRemoteInputController.addCallback(new RemoteInputController.Callback() {

            @Override

            public void onRemoteInputSent(NotificationEntry entry) {