diff options
| author | Adam Skory <skory@google.com> | 2013-08-31 04:53:33 +0100 |
|---|---|---|
| committer | Adam Skory <skory@google.com> | 2013-09-04 12:30:47 +0100 |
| commit | 16731d4dc02a335cf96edfa4055cbb6039ec78f5 (patch) | |
| tree | 821fa58e26e4bac810ea7c29b0a54687d7a63c8d /core | |
| parent | 87399fc21b642688a690be5869f14a7ba020afdb (diff) | |
| download | frameworks_base-16731d4dc02a335cf96edfa4055cbb6039ec78f5.zip frameworks_base-16731d4dc02a335cf96edfa4055cbb6039ec78f5.tar.gz frameworks_base-16731d4dc02a335cf96edfa4055cbb6039ec78f5.tar.bz2 | |
Add provideAssistData attr to public.xml
http://ag/323631 added the provideAssistData
attribute to the Service manifest tag.
It did not, however, add that attribute to
public.xml - making it impossible to actually
build a service that defines said tag.
So, add it.
Now that the attribute is where it should be,
restore @link notation to ServiceInfo.java
without breaking the offline docs build
( see http://ag//340279 ).
Also, make some log warnings related to
providing assist data slightly more verbose.
Bug: 10573008
Change-Id: Ie2bcb411c182d69738a2fa4a74de3171b9b9c455
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/pm/ServiceInfo.java | 2 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/pm/ServiceInfo.java b/core/java/android/content/pm/ServiceInfo.java index 3f17dc4..3dc8717 100644 --- a/core/java/android/content/pm/ServiceInfo.java +++ b/core/java/android/content/pm/ServiceInfo.java @@ -52,7 +52,7 @@ public class ServiceInfo extends ComponentInfo * Bit in {@link #flags}: If set, * {@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. + * the {@link android.R.attr#provideAssistData} attribute. */ public static final int FLAG_PROVIDE_ASSIST_DATA = 0x0004; diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index dce2db0..e6702b0 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2075,5 +2075,6 @@ <public type="attr" name="supportsSwitchingToNextInputMethod" /> <public type="attr" name="requireDeviceUnlock" /> <public type="attr" name="apduServiceBanner" /> + <public type="attr" name="provideAssistData" /> </resources> |