commit 13c73a03e8cc896bb014d8b30de4de4a2705497c
author Brad Fitzpatrick <bradfitz@android.com> Thu Sep 02 10:47:03 2010 -0700
committer Brad Fitzpatrick <bradfitz@android.com> Thu Sep 02 10:47:03 2010 -0700
tree 9380761cefb34327bac3fbf954510f8e15211446
parent 46ea162d40380b643e5e04bf79d7107b72a39080
parent c8687ffcae1bd5a1a29ee14681485b5fd36a0a82

resolved conflicts for merge of c8687ffc to master

Change-Id: I38f42b9671a56e85f2aa8a8e325120d6f6a59427

src/com/android/browser/BrowserProvider.java

diff --git a/src/com/android/browser/BrowserProvider.java b/src/com/android/browser/BrowserProvider.java
index 87c38e2..33f3006 100644
--- a/src/com/android/browser/BrowserProvider.java
+++ b/src/com/android/browser/BrowserProvider.java
@@ -385,7 +385,7 @@
                 fixPicasaBookmark();
                 Editor ed = p.edit();
                 ed.putBoolean("fix_picasa", false);
-                ed.commit();
+                ed.apply();
             }
         }
         mSearchManager = (SearchManager) context.getSystemService(Context.SEARCH_SERVICE);

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 2f739fa..5a7dd0d 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -401,7 +401,7 @@
         Editor ed = PreferenceManager.
                 getDefaultSharedPreferences(context).edit();
         ed.putString(PREF_HOMEPAGE, url);
-        ed.commit();
+        ed.apply();
         homeUrl = url;
     }
 
@@ -581,7 +581,7 @@
         reset();
         SharedPreferences p =
             PreferenceManager.getDefaultSharedPreferences(ctx);
-        p.edit().clear().commit();
+        p.edit().clear().apply();
         PreferenceManager.setDefaultValues(ctx, R.xml.browser_preferences,
                 true);
         // reset homeUrl

src/com/android/browser/SystemAllowGeolocationOrigins.java

diff --git a/src/com/android/browser/SystemAllowGeolocationOrigins.java b/src/com/android/browser/SystemAllowGeolocationOrigins.java
index 3f5a84e..b53611f 100644
--- a/src/com/android/browser/SystemAllowGeolocationOrigins.java
+++ b/src/com/android/browser/SystemAllowGeolocationOrigins.java
@@ -103,7 +103,7 @@
         // Save the new value as the last read value
         preferences.edit()
                 .putString(LAST_READ_ALLOW_GEOLOCATION_ORIGINS, newSetting)
-                .commit();
+                .apply();
 
         Set<String> oldOrigins = parseAllowGeolocationOrigins(lastReadSetting);
         Set<String> newOrigins = parseAllowGeolocationOrigins(newSetting);