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

Commit cf67ae06 authored by Ben Murdoch's avatar Ben Murdoch Committed by Android Git Automerger
Browse files

am 137e5a3b: Merge "Fix the build" 

* commit '137e5a3b':
  Fix the build
parents 4cbafb6a 137e5a3b

core/java/android/app/Service.java

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac 
     * full {@link Intent#ACTION_ASSIST} Intent with all of the context of the current

     * running foreground services.  You can override this method to place into the bundle

     * anything you would like to appear as an item in the

     * {@link Intent#EXTRA_SERVICES_ASSIST_CONTEXT} part of the assist Intent.

     * {@link Intent#EXTRA_ASSIST_SERVICES_CONTEXTS} part of the assist Intent.

     * This method will not be called if this service is not in the foreground.

     * The default implementation does nothing.

     */

core/java/android/content/pm/ServiceInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ public class ServiceInfo extends ComponentInfo 


    /**

     * Bit in {@link #flags}: If set,

     * {@link Service#onProvideAssistData(android.os.Bundle)} will be

     * called on the service when it is running in the foreground. Set from

     * the {@link android.R.attr#provideAssistData} attribute.

     * {@link android.app.Service#onProvideAssistData(android.os.Bundle)} will

     * be called on the service when it is running in the foreground. Set from

     * the android.R.attr#provideAssistData attribute.

     */

    public static final int FLAG_PROVIDE_ASSIST_DATA = 0x0004;