summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-06-12 16:34:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-12 16:34:38 +0000
commit8a435ced674562b827f91800317a89056e050b15 (patch)
treea1cefada8910115c49bb7ca764a9eb03ed5f8ed8 /api
parent3d1f7c26be89a252c6e83c0b813df27295d06212 (diff)
parentece0f4f5198e9e9cb60e96f036baf22c73411bec (diff)
downloadframeworks_base-8a435ced674562b827f91800317a89056e050b15.zip
frameworks_base-8a435ced674562b827f91800317a89056e050b15.tar.gz
frameworks_base-8a435ced674562b827f91800317a89056e050b15.tar.bz2
Merge "Fix APIs." into mnc-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt5
-rw-r--r--api/system-current.txt5
2 files changed, 6 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt
index d5685a6..3e0a1b3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -4000,6 +4000,7 @@ package android.app {
public deprecated class AssistContent {
ctor public AssistContent();
method public android.content.ClipData getClipData();
+ method public android.os.Bundle getExtras();
method public android.net.Uri getWebUri();
method public boolean isAppProvidedIntent();
method public void setClipData(android.content.ClipData);
@@ -4058,6 +4059,7 @@ package android.app {
}
public static class AssistStructure.WindowNode {
+ method public int getDisplayId();
method public int getHeight();
method public int getLeft();
method public android.app.AssistStructure.ViewNode getRootViewNode();
@@ -8457,8 +8459,6 @@ package android.content {
field public static final int NO_MATCH_CATEGORY = -4; // 0xfffffffc
field public static final int NO_MATCH_DATA = -2; // 0xfffffffe
field public static final int NO_MATCH_TYPE = -1; // 0xffffffff
- field public static final java.lang.String SCHEME_HTTP = "http";
- field public static final java.lang.String SCHEME_HTTPS = "https";
field public static final int SYSTEM_HIGH_PRIORITY = 1000; // 0x3e8
field public static final int SYSTEM_LOW_PRIORITY = -1000; // 0xfffffc18
}
@@ -37054,6 +37054,7 @@ package android.view {
public abstract class ViewStructure {
ctor public ViewStructure();
+ method public abstract int addChildCount(int);
method public abstract void asyncCommit();
method public abstract android.view.ViewAssistStructure asyncNewChild(int);
method public abstract int getChildCount();
diff --git a/api/system-current.txt b/api/system-current.txt
index fbf8d1d..a61b9fb 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4096,6 +4096,7 @@ package android.app {
public deprecated class AssistContent {
ctor public AssistContent();
method public android.content.ClipData getClipData();
+ method public android.os.Bundle getExtras();
method public android.net.Uri getWebUri();
method public boolean isAppProvidedIntent();
method public void setClipData(android.content.ClipData);
@@ -4154,6 +4155,7 @@ package android.app {
}
public static class AssistStructure.WindowNode {
+ method public int getDisplayId();
method public int getHeight();
method public int getLeft();
method public android.app.AssistStructure.ViewNode getRootViewNode();
@@ -8689,8 +8691,6 @@ package android.content {
field public static final int NO_MATCH_CATEGORY = -4; // 0xfffffffc
field public static final int NO_MATCH_DATA = -2; // 0xfffffffe
field public static final int NO_MATCH_TYPE = -1; // 0xffffffff
- field public static final java.lang.String SCHEME_HTTP = "http";
- field public static final java.lang.String SCHEME_HTTPS = "https";
field public static final int SYSTEM_HIGH_PRIORITY = 1000; // 0x3e8
field public static final int SYSTEM_LOW_PRIORITY = -1000; // 0xfffffc18
}
@@ -39331,6 +39331,7 @@ package android.view {
public abstract class ViewStructure {
ctor public ViewStructure();
+ method public abstract int addChildCount(int);
method public abstract void asyncCommit();
method public abstract android.view.ViewAssistStructure asyncNewChild(int);
method public abstract int getChildCount();