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 /include/android_runtime | |
| 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 'include/android_runtime')
| -rw-r--r-- | include/android_runtime/android_app_NativeActivity.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/android_runtime/android_app_NativeActivity.h b/include/android_runtime/android_app_NativeActivity.h index b49e02a..5dbec59 100644 --- a/include/android_runtime/android_app_NativeActivity.h +++ b/include/android_runtime/android_app_NativeActivity.h @@ -26,6 +26,9 @@ namespace android { +extern void android_NativeActivity_finish( + ANativeActivity* activity); + extern void android_NativeActivity_setWindowFormat( ANativeActivity* activity, int32_t format); |