summaryrefslogtreecommitdiffstats
path: root/common/java/com/android
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2011-01-19 16:14:23 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-19 16:14:23 -0800
commit4ddc71fff3a41ad8ab5c1bf526567b4ab0a4e989 (patch)
tree48c4a26c00d2d26ed8d4611040838a146dcb68d2 /common/java/com/android
parente3cfb7957d17a15b82fe1efa3ed36ad7093d487c (diff)
parent86018e0266578b120b9ad4133a6f189d2a3eac47 (diff)
downloadandroid_frameworks_ex-4ddc71fff3a41ad8ab5c1bf526567b4ab0a4e989.tar.gz
android_frameworks_ex-4ddc71fff3a41ad8ab5c1bf526567b4ab0a4e989.tar.bz2
android_frameworks_ex-4ddc71fff3a41ad8ab5c1bf526567b4ab0a4e989.zip
am 86018e02: Merge "Preventive fix in setNotificationsEnabled" into honeycomb
* commit '86018e0266578b120b9ad4133a6f189d2a3eac47': Preventive fix in setNotificationsEnabled
Diffstat (limited to 'common/java/com/android')
-rw-r--r--common/java/com/android/common/widget/CompositeCursorAdapter.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/java/com/android/common/widget/CompositeCursorAdapter.java b/common/java/com/android/common/widget/CompositeCursorAdapter.java
index d0c248f..d6064e1 100644
--- a/common/java/com/android/common/widget/CompositeCursorAdapter.java
+++ b/common/java/com/android/common/widget/CompositeCursorAdapter.java
@@ -513,8 +513,8 @@ public abstract class CompositeCursorAdapter extends BaseAdapter {
* disable notifications before making changes to several partitions at once.
*/
public void setNotificationsEnabled(boolean flag) {
- this.mNotificationsEnabled = flag;
- if (mNotificationNeeded) {
+ mNotificationsEnabled = flag;
+ if (flag && mNotificationNeeded) {
notifyDataSetChanged();
}
}