commit d578be2784ba452e7f4e3ef9723509ed115bcc5c
author Svetoslav Ganov <svetoslavganov@google.com> Thu Jul 21 11:48:57 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 21 11:48:57 2011 -0700
tree 18d9c564e70140fae618fb23e4af1585ca523f58
parent 526ebf9b1001910fa1e957086102ed697170cb2f
parent 8dbace2dc970208e03c3cee02a7902a5bb9827ef

Merge "Activity selections not always persisted by AcitivtyChooserView."

core/java/android/widget/ActivityChooserModel.java

diff --git a/core/java/android/widget/ActivityChooserModel.java b/core/java/android/widget/ActivityChooserModel.java
index d7429b3..4b0a6da 100644
--- a/core/java/android/widget/ActivityChooserModel.java
+++ b/core/java/android/widget/ActivityChooserModel.java
@@ -317,6 +317,7 @@
                 dataModel = new ActivityChooserModel(context, historyFileName);
                 sDataModelRegistry.put(historyFileName, dataModel);
             }
+            dataModel.readHistoricalData();
             return dataModel;
         }
     }
@@ -505,7 +506,7 @@
      *       data is read until this method is invoked.
      * <p>
      */
-    public void readHistoricalData() {
+    private void readHistoricalData() {
         synchronized (mInstanceLock) {
             if (!mCanReadHistoricalData || !mHistoricalRecordsChanged) {
                 return;
@@ -527,7 +528,7 @@
      * @throws IllegalStateException If this method is called before a call to
      *         {@link #readHistoricalData()}.
      */
-    public void persistHistoricalData() {
+    private void persistHistoricalData() {
         synchronized (mInstanceLock) {
             if (!mReadShareHistoryCalled) {
                 throw new IllegalStateException("No preceding call to #readHistoricalData");
@@ -629,6 +630,7 @@
             if (added) {
                 mHistoricalRecordsChanged = true;
                 pruneExcessiveHistoricalRecordsLocked();
+                persistHistoricalData();
                 sortActivities();
             }
             return added;

core/java/android/widget/ActivityChooserView.java

diff --git a/core/java/android/widget/ActivityChooserView.java b/core/java/android/widget/ActivityChooserView.java
index 5b69aa8..d85f8a4 100644
--- a/core/java/android/widget/ActivityChooserView.java
+++ b/core/java/android/widget/ActivityChooserView.java
@@ -307,7 +307,6 @@
         ActivityChooserModel dataModel = mAdapter.getDataModel();
         if (dataModel != null) {
             dataModel.registerObserver(mModelDataSetOberver);
-            dataModel.readHistoricalData();
         }
         mIsAttachedToWindow = true;
     }
@@ -318,7 +317,6 @@
         ActivityChooserModel dataModel = mAdapter.getDataModel();
         if (dataModel != null) {
             dataModel.unregisterObserver(mModelDataSetOberver);
-            dataModel.persistHistoricalData();
         }
         mIsAttachedToWindow = false;
     }