diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-21 20:27:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 20:27:15 -0700 |
| commit | bff26d156d23e55e2428e19b3fb7f52acf03f79f (patch) | |
| tree | b0993306b63215d4db6559a86f02bcdb5ff22c55 /native | |
| parent | 4924aee9cb1c5988359f3162b6e89689c5b101e1 (diff) | |
| parent | 86f1b643d10e0b5b17ae01db3b81020db87b3295 (diff) | |
| download | frameworks_base-bff26d156d23e55e2428e19b3fb7f52acf03f79f.zip frameworks_base-bff26d156d23e55e2428e19b3fb7f52acf03f79f.tar.gz frameworks_base-bff26d156d23e55e2428e19b3fb7f52acf03f79f.tar.bz2 | |
am 86f1b643: am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread
Merge commit '86f1b643d10e0b5b17ae01db3b81020db87b3295'
* commit '86f1b643d10e0b5b17ae01db3b81020db87b3295':
Fix issue #3117918: No way to finish a native activity
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, |