Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the build"

Browse Source
This commit is contained in:
Ben Murdoch
2013-08-08 11:18:04 +00:00
committed by Android (Google) Code Review
parent d4db6cbc0f 3650382175
commit 137e5a3b5a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/Service.java
View File

@@ -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 * 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 * running foreground services. You can override this method to place into the bundle
* anything you would like to appear as an item in the * 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. * This method will not be called if this service is not in the foreground.
* The default implementation does nothing. * The default implementation does nothing.
*/ */

6
core/java/android/content/pm/ServiceInfo.java
View File

@@ -50,9 +50,9 @@ public class ServiceInfo extends ComponentInfo
/** /**
* Bit in {@link #flags}: If set, * Bit in {@link #flags}: If set,
* {@link Service#onProvideAssistData(android.os.Bundle)} will be * {@link android.app.Service#onProvideAssistData(android.os.Bundle)} will
* called on the service when it is running in the foreground. Set from * be called on the service when it is running in the foreground. Set from
* the {@link android.R.attr#provideAssistData} attribute. * the android.R.attr#provideAssistData attribute.
*/ */
public static final int FLAG_PROVIDE_ASSIST_DATA = 0x0004; public static final int FLAG_PROVIDE_ASSIST_DATA = 0x0004;