summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-21 19:09:44 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-21 19:09:44 -0700
commitbf5efba238f81330f4b473e92b6931b85baa1cbc (patch)
tree0c44e38500f37c552c74f4d288ae7afa8b4b8413 /include
parent6b3178a6323e015644590ebaee86523e4bb81773 (diff)
parentdb28a94d499f995b467b07cee5c9b9119f538b1c (diff)
downloadframeworks_base-bf5efba238f81330f4b473e92b6931b85baa1cbc.zip
frameworks_base-bf5efba238f81330f4b473e92b6931b85baa1cbc.tar.gz
frameworks_base-bf5efba238f81330f4b473e92b6931b85baa1cbc.tar.bz2
Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread
Diffstat (limited to 'include')
-rw-r--r--include/android_runtime/android_app_NativeActivity.h3
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);