diff options
author | Dianne Hackborn <hackbod@google.com> | 2012-04-26 19:25:41 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-26 19:25:41 -0700 |
commit | 493f74e5a4ed948a72575d11840a8366b5e9f672 (patch) | |
tree | c8faa348d7a4f55b64bbaa9bc3c86f53d552dee8 /api | |
parent | e6eb9291423988e4f2e82367d760490397222fe3 (diff) | |
parent | ecc5a9cca000b62d2a649b795460fd791a206a89 (diff) | |
download | frameworks_base-493f74e5a4ed948a72575d11840a8366b5e9f672.zip frameworks_base-493f74e5a4ed948a72575d11840a8366b5e9f672.tar.gz frameworks_base-493f74e5a4ed948a72575d11840a8366b5e9f672.tar.bz2 |
Merge "Add new Activity.finishAffinity() method." into jb-dev
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 882503d..9303937 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2601,6 +2601,7 @@ package android.app { method public void finish(); method public void finishActivity(int); method public void finishActivityFromChild(android.app.Activity, int); + method public void finishAffinity(); method public void finishFromChild(android.app.Activity); method public android.app.ActionBar getActionBar(); method public final android.app.Application getApplication(); |