diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-21 20:17:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 20:17:50 -0700 |
| commit | 86f1b643d10e0b5b17ae01db3b81020db87b3295 (patch) | |
| tree | 2d7deecbacb72c2cb8277711e36653343b222175 /include/android_runtime | |
| parent | 482284ad0e3226b49c27bf41442c1cb150853226 (diff) | |
| parent | bf5efba238f81330f4b473e92b6931b85baa1cbc (diff) | |
| download | frameworks_base-86f1b643d10e0b5b17ae01db3b81020db87b3295.zip frameworks_base-86f1b643d10e0b5b17ae01db3b81020db87b3295.tar.gz frameworks_base-86f1b643d10e0b5b17ae01db3b81020db87b3295.tar.bz2 | |
am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread
Merge commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc' into gingerbread-plus-aosp
* commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc':
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); |