Remove our dependency on gsf.

Hardcode the account values when looking up the hosted domain. We also hardcode
the settings uri for looking up the client id. This is the better solution for
now because the client id is written only once. If the partner setup were to
write the value to the BrowserProvider, it would get erased if the user decided
to reset the Browser.

1 files changed, 2 insertions, 4 deletions

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 1e282c6..fbff0fa 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -17,8 +17,6 @@
 
 package com.android.browser;
 
-import com.google.android.gsf.GoogleSettingsContract.Partner;
-
 import android.app.ActivityManager;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -578,8 +576,8 @@ class BrowserSettings extends Observable {
     private String getFactoryResetHomeUrl(Context context) {
         String url = context.getResources().getString(R.string.homepage_base);
         if (url.indexOf("{CID}") != -1) {
-            url = url.replace("{CID}", Partner.getString(context
-                    .getContentResolver(), Partner.CLIENT_ID, "android-google"));
+            url = url.replace("{CID}",
+                    BrowserProvider.getClientId(context.getContentResolver()));
         }
         return url;
     }