diff options
| author | Craig Mautner <cmautner@google.com> | 2014-05-21 16:35:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 16:35:27 +0000 |
| commit | 4ee35806090a5e01600c87ff12ecd041ad4586f8 (patch) | |
| tree | 3405211b88face21680e590630f90e0ecd8d6665 /api | |
| parent | bee9d71293ede690faefd2d36141aece893a9e71 (diff) | |
| parent | 73f843de4b65772c624ca8ebb8c976a279e37ce9 (diff) | |
| download | frameworks_base-4ee35806090a5e01600c87ff12ecd041ad4586f8.zip frameworks_base-4ee35806090a5e01600c87ff12ecd041ad4586f8.tar.gz frameworks_base-4ee35806090a5e01600c87ff12ecd041ad4586f8.tar.bz2 | |
Merge "Change method name per API council request"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index def0755..3d5cae2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3214,9 +3214,9 @@ package android.app { method public void finishActivity(int); method public void finishActivityFromChild(android.app.Activity, int); method public void finishAffinity(); + method public void finishAfterTransition(); method public void finishAndRemoveTask(); method public void finishFromChild(android.app.Activity); - method public void finishWithTransition(); method public android.app.ActionBar getActionBar(); method public final android.app.Application getApplication(); method public android.content.ComponentName getCallingActivity(); |