PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix GoogleSettings check in PrivacySettings"

Browse Source
This commit is contained in:
Bjorn Bringert
2010-01-25 12:45:17 -08:00
committed by Android (Google) Code Review
parent 3587f3d1bb ecfeaffdfa
commit edc585b644
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/PrivacySettings.java
View File

@@ -45,7 +45,7 @@ public class PrivacySettings extends PreferenceActivity implements
private static final String PREFS_USE_LOCATION = "use_location"; private static final String PREFS_USE_LOCATION = "use_location";
// Vendor specific // 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 LOCATION_CATEGORY = "location_category";
private static final String SETTINGS_CATEGORY = "settings_category"; private static final String SETTINGS_CATEGORY = "settings_category";
private static final String USE_LOCATION = "use_location"; private static final String USE_LOCATION = "use_location";
@@ -69,11 +69,7 @@ public class PrivacySettings extends PreferenceActivity implements
mBackup = (CheckBoxPreference) getPreferenceScreen().findPreference(BACKUP_SETTINGS); mBackup = (CheckBoxPreference) getPreferenceScreen().findPreference(BACKUP_SETTINGS);
// Vendor specific // Vendor specific
try { if (getPackageManager().resolveContentProvider(GSETTINGS_PROVIDER, 0) == null) {
if (mUseLocation != null) {
getPackageManager().getPackageInfo(GSETTINGS_PROVIDER, 0);
}
} catch (NameNotFoundException nnfe) {
getPreferenceScreen().removePreference(findPreference(LOCATION_CATEGORY)); getPreferenceScreen().removePreference(findPreference(LOCATION_CATEGORY));
getPreferenceScreen().removePreference(findPreference(SETTINGS_CATEGORY)); getPreferenceScreen().removePreference(findPreference(SETTINGS_CATEGORY));
} }