diff options
| author | Adam Skory <skory@google.com> | 2013-09-11 11:27:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-11 11:27:50 +0000 |
| commit | 86d9c457de3285f01552d4046a8a260c7a75147f (patch) | |
| tree | c60f8bd088a714cd5d7b527f72c9b55cf07630ad /api/current.txt | |
| parent | e3af2dd7a7883c5ae60fd6b9f6fb8d434e12d66a (diff) | |
| parent | 7140a25f0135f473b66d01eb042471b2f0ebc836 (diff) | |
| download | frameworks_base-86d9c457de3285f01552d4046a8a260c7a75147f.zip frameworks_base-86d9c457de3285f01552d4046a8a260c7a75147f.tar.gz frameworks_base-86d9c457de3285f01552d4046a8a260c7a75147f.tar.bz2 | |
Merge "Revert services assist context in KitKat" into klp-dev
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 3c4555f..9d3dd0f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -845,7 +845,6 @@ 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 = 16843758; // 0x10103ee field public static final int publicKey = 16843686; // 0x10103a6 field public static final int queryActionMsg = 16843227; // 0x10101db field public static final int queryAfterZeroResults = 16843394; // 0x1010282 @@ -4246,7 +4245,6 @@ package android.app { method public void onCreate(); method public void onDestroy(); method public void onLowMemory(); - method public void onProvideAssistData(android.os.Bundle); method public void onRebind(android.content.Intent); method public deprecated void onStart(android.content.Intent, int); method public int onStartCommand(android.content.Intent, int, int); @@ -6406,7 +6404,6 @@ package android.content { field public static final java.lang.String ACTION_USER_INITIALIZE = "android.intent.action.USER_INITIALIZE"; field public static final java.lang.String ACTION_USER_PRESENT = "android.intent.action.USER_PRESENT"; field public static final java.lang.String ACTION_VIEW = "android.intent.action.VIEW"; - field public static final java.lang.String ACTION_VOICE_ASSIST = "android.intent.action.VOICE_ASSIST"; field public static final java.lang.String ACTION_VOICE_COMMAND = "android.intent.action.VOICE_COMMAND"; field public static final deprecated java.lang.String ACTION_WALLPAPER_CHANGED = "android.intent.action.WALLPAPER_CHANGED"; field public static final java.lang.String ACTION_WEB_SEARCH = "android.intent.action.WEB_SEARCH"; @@ -6448,8 +6445,6 @@ package android.content { field public static final deprecated java.lang.String EXTRA_ALLOW_REPLACE = "android.intent.extra.ALLOW_REPLACE"; field public static final java.lang.String EXTRA_ASSIST_CONTEXT = "android.intent.extra.ASSIST_CONTEXT"; field public static final java.lang.String EXTRA_ASSIST_PACKAGE = "android.intent.extra.ASSIST_PACKAGE"; - field public static final java.lang.String EXTRA_ASSIST_SERVICES_CONTEXTS = "android.intent.extra.ASSIST_SERVICES_CONTEXTS"; - field public static final java.lang.String EXTRA_ASSIST_SERVICES_PACKAGES = "android.intent.extra.ASSIST_SERVICES_PACKAGES"; field public static final java.lang.String EXTRA_BCC = "android.intent.extra.BCC"; field public static final java.lang.String EXTRA_BUG_REPORT = "android.intent.extra.BUG_REPORT"; field public static final java.lang.String EXTRA_CC = "android.intent.extra.CC"; @@ -7449,7 +7444,6 @@ package android.content.pm { method public void dump(android.util.Printer, java.lang.String); field public static final android.os.Parcelable.Creator CREATOR; field public static final int FLAG_ISOLATED_PROCESS = 2; // 0x2 - field public static final int FLAG_PROVIDE_ASSIST_DATA = 4; // 0x4 field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000 field public static final int FLAG_STOP_WITH_TASK = 1; // 0x1 field public int flags; |