diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-06-11 13:29:01 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2015-06-11 18:07:43 -0700 |
| commit | ece0f4f5198e9e9cb60e96f036baf22c73411bec (patch) | |
| tree | bbbbce3ca974998bdea2347266173985a06d54b0 /api/system-current.txt | |
| parent | 2430f47be7b7de7456e16eb5098242c22a6317ee (diff) | |
| download | frameworks_base-ece0f4f5198e9e9cb60e96f036baf22c73411bec.zip frameworks_base-ece0f4f5198e9e9cb60e96f036baf22c73411bec.tar.gz frameworks_base-ece0f4f5198e9e9cb60e96f036baf22c73411bec.tar.bz2 | |
Fix APIs.
Issue #21039494: API Review: android.os.PowerManager.isDeviceIdleMode()
Issue #21347000: API Review: android.content.IntentFilter
Issue #20654534: API Review: android.app.assist
Also allow use of ActivityManager.setWatchHeapLimit on any platform
build as long as the calling app is debuggable.
Change-Id: Ic597e596fa772fcdf2553b64f444b3d9269e8b92
Diffstat (limited to 'api/system-current.txt')
| -rw-r--r-- | api/system-current.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 2345ef6..b340766 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4095,6 +4095,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); @@ -4153,6 +4154,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(); @@ -8688,8 +8690,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 } @@ -39330,6 +39330,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(); |