diff options
| author | Jason Monk <jmonk@google.com> | 2014-05-07 19:22:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-07 19:22:38 +0000 |
| commit | 1a285ee293ad7760a0a7c7017f81cad5cdc717ca (patch) | |
| tree | 1d0db8f2cce704094086841c687f045e348dbeef /api | |
| parent | 4ef10931b410df2c84b0703009d340bd13a97738 (diff) | |
| parent | 01d1d907530e23f5e86edabada9c354420277df0 (diff) | |
| download | frameworks_base-1a285ee293ad7760a0a7c7017f81cad5cdc717ca.zip frameworks_base-1a285ee293ad7760a0a7c7017f81cad5cdc717ca.tar.gz frameworks_base-1a285ee293ad7760a0a7c7017f81cad5cdc717ca.tar.bz2 | |
am 6e6d1f21: Merge "Make Lock Task API public."
* commit '6e6d1f214766bbf00b4b0298d95ec1b42461e470':
Make Lock Task API public.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index c75de7e..ffc4513 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3363,10 +3363,12 @@ package android.app { method public void startIntentSenderForResult(android.content.IntentSender, int, android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException; method public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException; method public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException; + method public void startLockTask(); method public deprecated void startManagingCursor(android.database.Cursor); method public boolean startNextMatchingActivity(android.content.Intent); method public boolean startNextMatchingActivity(android.content.Intent, android.os.Bundle); method public void startSearch(java.lang.String, boolean, android.os.Bundle, boolean); + method public void stopLockTask(); method public deprecated void stopManagingCursor(android.database.Cursor); method public void takeKeyEvents(boolean); method public void triggerSearch(java.lang.String, android.os.Bundle); |