diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/AbsListView.java | 3 | ||||
| -rw-r--r-- | core/jni/android_backup_BackupDataOutput.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_backup_FileBackupHelper.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index ec02143..14a85f8 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -1056,11 +1056,12 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te public Parcelable onSaveInstanceState() { /* * This doesn't really make sense as the place to dismiss the - * popup, but there don't seem to be any other useful hooks + * popups, but there don't seem to be any other useful hooks * that happen early enough to keep from getting complaints * about having leaked the window. */ dismissPopup(); + dismissGesturesPopup(); Parcelable superState = super.onSaveInstanceState(); diff --git a/core/jni/android_backup_BackupDataOutput.cpp b/core/jni/android_backup_BackupDataOutput.cpp index 8fce2a2..aab1233 100644 --- a/core/jni/android_backup_BackupDataOutput.cpp +++ b/core/jni/android_backup_BackupDataOutput.cpp @@ -20,7 +20,7 @@ #include "JNIHelp.h" #include <android_runtime/AndroidRuntime.h> -#include <utils/backup_helpers.h> +#include <utils/BackupHelpers.h> namespace android { diff --git a/core/jni/android_backup_FileBackupHelper.cpp b/core/jni/android_backup_FileBackupHelper.cpp index a05d812..a46f37b 100644 --- a/core/jni/android_backup_FileBackupHelper.cpp +++ b/core/jni/android_backup_FileBackupHelper.cpp @@ -20,7 +20,7 @@ #include "JNIHelp.h" #include <android_runtime/AndroidRuntime.h> -#include <utils/backup_helpers.h> +#include <utils/BackupHelpers.h> namespace android { |