summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorAdam Skory <skory@google.com>2013-08-31 04:53:33 +0100
committerAdam Skory <skory@google.com>2013-09-04 12:30:47 +0100
commit16731d4dc02a335cf96edfa4055cbb6039ec78f5 (patch)
tree821fa58e26e4bac810ea7c29b0a54687d7a63c8d /api/current.txt
parent87399fc21b642688a690be5869f14a7ba020afdb (diff)
downloadframeworks_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 'api/current.txt')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 7d06e1c..099b1a5 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -845,6 +845,7 @@ package android {
field public static final int prompt = 16843131; // 0x101017b
field public static final int propertyName = 16843489; // 0x10102e1
field public static final int protectionLevel = 16842761; // 0x1010009
+ field public static final int provideAssistData = 16843756; // 0x10103ec
field public static final int publicKey = 16843686; // 0x10103a6
field public static final int queryActionMsg = 16843227; // 0x10101db
field public static final int queryAfterZeroResults = 16843394; // 0x1010282