commit edc585b644192377e40e75c41fa5b66646696dd3
author Bjorn Bringert <bringert@android.com> Mon Jan 25 12:45:17 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 25 12:45:17 2010 -0800
tree 13868003a7f84c085f4959cd42e4cea6e563ce19
parent 3587f3d1bbd8c0ea525d216bd1c37ab948493671
parent ecfeaffdfa19bea836f24fd399376825c377eaa9

Merge "Fix GoogleSettings check in PrivacySettings"

src/com/android/settings/PrivacySettings.java

diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 2edb328..611af04 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -45,7 +45,7 @@
     private static final String PREFS_USE_LOCATION = "use_location";
 
     // Vendor specific
-    private static final String GSETTINGS_PROVIDER = "com.google.android.providers.settings";
+    private static final String GSETTINGS_PROVIDER = "com.google.settings";
     private static final String LOCATION_CATEGORY = "location_category";
     private static final String SETTINGS_CATEGORY = "settings_category";
     private static final String USE_LOCATION = "use_location";
@@ -69,11 +69,7 @@
         mBackup = (CheckBoxPreference) getPreferenceScreen().findPreference(BACKUP_SETTINGS);
 
         // Vendor specific
-        try {
-            if (mUseLocation != null) {
-                getPackageManager().getPackageInfo(GSETTINGS_PROVIDER, 0);
-            }
-        } catch (NameNotFoundException nnfe) {
+        if (getPackageManager().resolveContentProvider(GSETTINGS_PROVIDER, 0) == null) {
             getPreferenceScreen().removePreference(findPreference(LOCATION_CATEGORY));
             getPreferenceScreen().removePreference(findPreference(SETTINGS_CATEGORY));
         }