diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-10-21 17:22:30 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2010-10-21 19:07:37 -0700 |
commit | db28a94d499f995b467b07cee5c9b9119f538b1c (patch) | |
tree | f720143b3b6a9813d26fdbc210bec10a0780f0b0 /native | |
parent | 7dc08fb070ff7455e794fc81645ccb4349cd152f (diff) | |
download | frameworks_base-db28a94d499f995b467b07cee5c9b9119f538b1c.zip frameworks_base-db28a94d499f995b467b07cee5c9b9119f538b1c.tar.gz frameworks_base-db28a94d499f995b467b07cee5c9b9119f538b1c.tar.bz2 |
Fix issue #3117918: No way to finish a native activity
Change-Id: Ic53e712f7ab5412d72a31b96ecba252344b91644
Diffstat (limited to 'native')
-rw-r--r-- | native/android/native_activity.cpp | 4 | ||||
-rw-r--r-- | native/include/android/native_activity.h | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/native/android/native_activity.cpp b/native/android/native_activity.cpp index 0c6823a..056255f 100644 --- a/native/android/native_activity.cpp +++ b/native/android/native_activity.cpp @@ -21,6 +21,10 @@ using namespace android; +void ANativeActivity_finish(ANativeActivity* activity) { + android_NativeActivity_finish(activity); +} + void ANativeActivity_setWindowFormat(ANativeActivity* activity, int32_t format) { android_NativeActivity_setWindowFormat(activity, format); } diff --git a/native/include/android/native_activity.h b/native/include/android/native_activity.h index d74e1ce..a8f11c9 100644 --- a/native/include/android/native_activity.h +++ b/native/include/android/native_activity.h @@ -227,6 +227,12 @@ typedef void ANativeActivity_createFunc(ANativeActivity* activity, */ extern ANativeActivity_createFunc ANativeActivity_onCreate; +/** + * Finish the given activity. Its finish() method will be called, causing it + * to be stopped and destroyed. + */ +void ANativeActivity_finish(ANativeActivity* activity); + void ANativeActivity_setWindowFormat(ANativeActivity* activity, int32_t format); void ANativeActivity_setWindowFlags(ANativeActivity* activity, |