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

Commit 1927ae8a authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #6717667: expanded notification actions don't work on the lock screen 

FLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS was a mistake.

Instead, and the infrastructure for the status bar to take care
of closing and hiding things itself when you press these buttons,
just like it does for the main Intent of the notification.

Bug: 6717667
Change-Id: I1b22186e0cedc05f46a1a3ec78053a72afaf61b1
parent e9b4b3e9

api/16.txt

+41 −1
Original line number Diff line number Diff line
@@ -676,6 +676,7 @@ package android { 
    field public static final int measureAllChildren = 16843018; // 0x101010a

    field public static final int measureWithLargestChild = 16843476; // 0x10102d4

    field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad

    field public static final int mediaRouteTypes = 16843694; // 0x10103ae

    field public static final int menuCategory = 16843230; // 0x10101de

    field public static final int mimeType = 16842790; // 0x1010026

    field public static final int minDate = 16843583; // 0x101033f
@@ -3688,6 +3689,8 @@ package android.app { 
    ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet);

    ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet, int);

    method public int getRouteTypes();

    method public void onAttachedToWindow();

    method public void onDetachedFromWindow();

    method public void setExtendedSettingsClickListener(android.view.View.OnClickListener);

    method public void setRouteTypes(int);

    method public void showDialog();
@@ -3759,6 +3762,7 @@ package android.app { 
  public static class Notification.BigPictureStyle extends android.app.Notification.Style {

    ctor public Notification.BigPictureStyle();

    ctor public Notification.BigPictureStyle(android.app.Notification.Builder);

    method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.Bitmap);

    method public android.app.Notification.BigPictureStyle bigPicture(android.graphics.Bitmap);

    method public android.app.Notification build();

    method public android.app.Notification.BigPictureStyle setBigContentTitle(java.lang.CharSequence);
@@ -5827,7 +5831,6 @@ package android.content { 
    field public static final int FLAG_ACTIVITY_CLEAR_TASK = 32768; // 0x8000

    field public static final int FLAG_ACTIVITY_CLEAR_TOP = 67108864; // 0x4000000

    field public static final int FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET = 524288; // 0x80000

    field public static final int FLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS = 8192; // 0x2000

    field public static final int FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS = 8388608; // 0x800000

    field public static final int FLAG_ACTIVITY_FORWARD_RESULT = 33554432; // 0x2000000

    field public static final int FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY = 1048576; // 0x100000
@@ -11537,6 +11540,7 @@ package android.media { 
    method public abstract void onRouteSelected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);

    method public abstract void onRouteUngrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup);

    method public abstract void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);

    method public abstract void onRouteVolumeChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);

  }















  public static class MediaRouter.RouteCategory {










@@ -11564,10 +11568,21 @@ package android.media {













    method public android.graphics.drawable.Drawable getIconDrawable();















    method public java.lang.CharSequence getName();















    method public java.lang.CharSequence getName(android.content.Context);













    method public int getPlaybackStream();













    method public int getPlaybackType();















    method public java.lang.CharSequence getStatus();















    method public int getSupportedTypes();















    method public java.lang.Object getTag();













    method public int getVolume();













    method public int getVolumeHandling();













    method public int getVolumeMax();













    method public void requestSetVolume(int);













    method public void requestUpdateVolume(int);















    method public void setTag(java.lang.Object);













    field public static final int PLAYBACK_TYPE_LOCAL = 0; // 0x0













    field public static final int PLAYBACK_TYPE_REMOTE = 1; // 0x1













    field public static final int PLAYBACK_VOLUME_FIXED = 0; // 0x0













    field public static final int PLAYBACK_VOLUME_VARIABLE = 1; // 0x1















  }





























  public static class MediaRouter.SimpleCallback extends android.media.MediaRouter.Callback {









@@ -11579,15 +11594,29 @@ package android.media {













    method public void onRouteSelected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);















    method public void onRouteUngrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup);















    method public void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);













    method public void onRouteVolumeChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);















  }





























  public static class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo {













    method public android.media.RemoteControlClient getRemoteControlClient();















    method public void setIconDrawable(android.graphics.drawable.Drawable);















    method public void setIconResource(int);















    method public void setName(java.lang.CharSequence);















    method public void setName(int);













    method public void setPlaybackStream(int);













    method public void setPlaybackType(int);















    method public void setRemoteControlClient(android.media.RemoteControlClient);















    method public void setStatus(java.lang.CharSequence);













    method public void setVolume(int);













    method public void setVolumeCallback(android.media.MediaRouter.VolumeCallback);













    method public void setVolumeHandling(int);













    method public void setVolumeMax(int);













  }

























  public static abstract class MediaRouter.VolumeCallback {













    ctor public MediaRouter.VolumeCallback();













    method public abstract void onVolumeSetRequest(android.media.MediaRouter.RouteInfo, int);













    method public abstract void onVolumeUpdateRequest(android.media.MediaRouter.RouteInfo, int);















  }





























  public class MediaScannerConnection implements android.content.ServiceConnection {










@@ -22816,10 +22845,18 @@ package android.view {













  public abstract class ActionProvider {















    ctor public ActionProvider(android.content.Context);















    method public boolean hasSubMenu();













    method public boolean isVisible();















    method public abstract deprecated android.view.View onCreateActionView();















    method public android.view.View onCreateActionView(android.view.MenuItem);















    method public boolean onPerformDefaultAction();















    method public void onPrepareSubMenu(android.view.SubMenu);













    method public boolean overridesItemVisibility();













    method public void refreshVisibility();













    method public void setVisibilityListener(android.view.ActionProvider.VisibilityListener);













  }

























  public static abstract interface ActionProvider.VisibilityListener {













    method public abstract void onActionProviderVisibilityChanged(boolean);















  }





























  public final class Choreographer {










@@ -28146,8 +28183,11 @@ package android.widget {













    method public void setString(int, java.lang.String, java.lang.String);















    method public void setTextColor(int, int);















    method public void setTextViewCompoundDrawables(int, int, int, int, int);













    method public void setTextViewCompoundDrawablesRelative(int, int, int, int, int);















    method public void setTextViewText(int, java.lang.CharSequence);













    method public void setTextViewTextSize(int, int, float);















    method public void setUri(int, java.lang.String, android.net.Uri);













    method public void setViewPadding(int, int, int, int, int);















    method public void setViewVisibility(int, int);















    method public void showNext(int);















    method public void showPrevious(int);

























api/current.txt



+2
−1




























Original line number
Diff line number
Diff line








@@ -3689,6 +3689,8 @@ package android.app {













    ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet);















    ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet, int);















    method public int getRouteTypes();













    method public void onAttachedToWindow();













    method public void onDetachedFromWindow();















    method public void setExtendedSettingsClickListener(android.view.View.OnClickListener);















    method public void setRouteTypes(int);















    method public void showDialog();










@@ -5829,7 +5831,6 @@ package android.content {













    field public static final int FLAG_ACTIVITY_CLEAR_TASK = 32768; // 0x8000















    field public static final int FLAG_ACTIVITY_CLEAR_TOP = 67108864; // 0x4000000















    field public static final int FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET = 524288; // 0x80000













    field public static final int FLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS = 8192; // 0x2000















    field public static final int FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS = 8388608; // 0x800000















    field public static final int FLAG_ACTIVITY_FORWARD_RESULT = 33554432; // 0x2000000















    field public static final int FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY = 1048576; // 0x100000

























core/java/android/app/ActivityManagerNative.java



+23
−0




























Original line number
Diff line number
Diff line








@@ -1617,6 +1617,16 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM













            return true;















        }





























        case IS_INTENT_SENDER_AN_ACTIVITY_TRANSACTION: {













            data.enforceInterface(IActivityManager.descriptor);













            IIntentSender r = IIntentSender.Stub.asInterface(













                data.readStrongBinder());













            boolean res = isIntentSenderAnActivity(r);













            reply.writeNoException();













            reply.writeInt(res ? 1 : 0);













            return true;













        }





























        case UPDATE_PERSISTENT_CONFIGURATION_TRANSACTION: {















            data.enforceInterface(IActivityManager.descriptor);















            Configuration config = Configuration.CREATOR.createFromParcel(data);










@@ -3753,6 +3763,19 @@ class ActivityManagerProxy implements IActivityManager













        return res;















    }





























    public boolean isIntentSenderAnActivity(IIntentSender sender) throws RemoteException {













        Parcel data = Parcel.obtain();













        Parcel reply = Parcel.obtain();













        data.writeInterfaceToken(IActivityManager.descriptor);













        data.writeStrongBinder(sender.asBinder());













        mRemote.transact(IS_INTENT_SENDER_AN_ACTIVITY_TRANSACTION, data, reply, 0);













        reply.readException();













        boolean res = reply.readInt() != 0;













        data.recycle();













        reply.recycle();













        return res;













    }





























    public void updatePersistentConfiguration(Configuration values) throws RemoteException















    {















        Parcel data = Parcel.obtain();

































core/java/android/app/IActivityManager.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -338,6 +338,8 @@ public interface IActivityManager extends IInterface {





























    public boolean isIntentSenderTargetedToPackage(IIntentSender sender) throws RemoteException;





























    public boolean isIntentSenderAnActivity(IIntentSender sender) throws RemoteException;





























    public void updatePersistentConfiguration(Configuration values) throws RemoteException;































    public long[] getProcessPss(int[] pids) throws RemoteException;










@@ -603,4 +605,5 @@ public interface IActivityManager extends IInterface {













    int FINISH_ACTIVITY_AFFINITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+148;















    int GET_LAUNCHED_FROM_UID_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+149;















    int UNSTABLE_PROVIDER_DIED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+150;













    int IS_INTENT_SENDER_AN_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+151;















}
























core/java/android/app/PendingIntent.java



+14
−0




























Original line number
Diff line number
Diff line








@@ -630,6 +630,20 @@ public final class PendingIntent implements Parcelable {













        }















    }





























    /**













     * @hide













     * Check whether this PendingIntent will launch an Activity.













     */













    public boolean isActivity() {













        try {













            return ActivityManagerNative.getDefault()













                .isIntentSenderAnActivity(mTarget);













        } catch (RemoteException e) {













            // Should never happen.













            return false;













        }













    }





























    /**















     * Comparison operator on two PendingIntent objects, such that true















     * is returned then they both represent the same operation from the