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

Commit 2f9a2fe0 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "Work on issue #28221912: Starting service as foreground might..." into... 

Merge "Work on issue #28221912: Starting service as foreground might..." into nyc-dev am: 9c211a33 am: bf7e1343
am: dbc4e4fa

* commit 'dbc4e4fa':
  Work on issue #28221912: Starting service as foreground might...

Change-Id: I243f791317962d2ab9eea156b0f146f6fcc96fcb
parents c617ac8a dbc4e4fa

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -5554,6 +5554,7 @@ package android.app { 
    method public boolean onUnbind(android.content.Intent);

    method public final void startForeground(int, android.app.Notification);

    method public final void stopForeground(boolean);

    method public final void stopForeground(int);

    method public final void stopSelf();

    method public final void stopSelf(int);

    method public final boolean stopSelfResult(int);
@@ -5564,6 +5565,8 @@ package android.app { 
    field public static final int START_REDELIVER_INTENT = 3; // 0x3

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

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

    field public static final int STOP_FOREGROUND_DETACH = 2; // 0x2

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

  }















  public abstract class SharedElementCallback {

























api/system-current.txt



+3
−0






























Original line number
Diff line number
Diff line








@@ -5689,6 +5689,7 @@ package android.app {













    method public boolean onUnbind(android.content.Intent);















    method public final void startForeground(int, android.app.Notification);















    method public final void stopForeground(boolean);













    method public final void stopForeground(int);















    method public final void stopSelf();















    method public final void stopSelf(int);















    method public final boolean stopSelfResult(int);









@@ -5699,6 +5700,8 @@ package android.app {













    field public static final int START_REDELIVER_INTENT = 3; // 0x3















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















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













    field public static final int STOP_FOREGROUND_DETACH = 2; // 0x2













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















  }





























  public abstract class SharedElementCallback {

























api/test-current.txt



+3
−0






























Original line number
Diff line number
Diff line








@@ -5554,6 +5554,7 @@ package android.app {













    method public boolean onUnbind(android.content.Intent);















    method public final void startForeground(int, android.app.Notification);















    method public final void stopForeground(boolean);













    method public final void stopForeground(int);















    method public final void stopSelf();















    method public final void stopSelf(int);















    method public final boolean stopSelfResult(int);









@@ -5564,6 +5565,8 @@ package android.app {













    field public static final int START_REDELIVER_INTENT = 3; // 0x3















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















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













    field public static final int STOP_FOREGROUND_DETACH = 2; // 0x2













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















  }





























  public abstract class SharedElementCallback {

























core/java/android/app/ActivityManagerNative.java



+4
−4






























Original line number
Diff line number
Diff line








@@ -1111,8 +1111,8 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM













            if (data.readInt() != 0) {















                notification = Notification.CREATOR.createFromParcel(data);















            }













            boolean removeNotification = data.readInt() != 0;













            setServiceForeground(className, token, id, notification, removeNotification);













            int sflags = data.readInt();













            setServiceForeground(className, token, id, notification, sflags);















            reply.writeNoException();















            return true;















        }










@@ -4300,7 +4300,7 @@ class ActivityManagerProxy implements IActivityManager













        return res;















    }















    public void setServiceForeground(ComponentName className, IBinder token,













            int id, Notification notification, boolean removeNotification) throws RemoteException {













            int id, Notification notification, int flags) throws RemoteException {















        Parcel data = Parcel.obtain();















        Parcel reply = Parcel.obtain();















        data.writeInterfaceToken(IActivityManager.descriptor);









@@ -4313,7 +4313,7 @@ class ActivityManagerProxy implements IActivityManager













        } else {















            data.writeInt(0);















        }













        data.writeInt(removeNotification ? 1 : 0);













        data.writeInt(flags);















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















        reply.readException();















        data.recycle();

































core/java/android/app/IActivityManager.java



+1
−1






























Original line number
Diff line number
Diff line








@@ -235,7 +235,7 @@ public interface IActivityManager extends IInterface {













    public boolean stopServiceToken(ComponentName className, IBinder token,















            int startId) throws RemoteException;















    public void setServiceForeground(ComponentName className, IBinder token,













            int id, Notification notification, boolean keepNotification) throws RemoteException;













            int id, Notification notification, int flags) throws RemoteException;















    public int bindService(IApplicationThread caller, IBinder token, Intent service,















            String resolvedType, IServiceConnection connection, int flags,















            String callingPackage, int userId) throws RemoteException;