diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-25 11:55:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-25 11:55:20 -0700 |
| commit | cfb4089b372ee6be1c803a7deae56b464dc5d004 (patch) | |
| tree | 67f24110af6276f297877f4f2604e11f9052249d /src | |
| parent | e13209ab423932a739b66eac7d8bd4abd6e52287 (diff) | |
| parent | 7f894124f4e1b8e7a02f6868adf1c21a25179c66 (diff) | |
| download | packages_apps_Settings-cfb4089b372ee6be1c803a7deae56b464dc5d004.tar.gz packages_apps_Settings-cfb4089b372ee6be1c803a7deae56b464dc5d004.tar.bz2 packages_apps_Settings-cfb4089b372ee6be1c803a7deae56b464dc5d004.zip | |
Merge change 22611 into eclair
* changes:
Hide the "Enable Assisted GPS" checkbox in security & location settings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index e181e6ee2..c8933dcdb 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -305,7 +305,9 @@ public class SecuritySettings extends PreferenceActivity implements boolean enabled = mGps.isChecked(); Settings.Secure.setLocationProviderEnabled(getContentResolver(), LocationManager.GPS_PROVIDER, enabled); - mAssistedGps.setEnabled(enabled); + if (mAssistedGps != null) { + mAssistedGps.setEnabled(enabled); + } } else if (preference == mAssistedGps) { Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSISTED_GPS_ENABLED, mAssistedGps.isChecked() ? 1 : 0); @@ -355,9 +357,11 @@ public class SecuritySettings extends PreferenceActivity implements mNetwork.setChecked(Settings.Secure.isLocationProviderEnabled( res, LocationManager.NETWORK_PROVIDER)); mGps.setChecked(gpsEnabled); - mAssistedGps.setChecked(Settings.Secure.getInt(res, - Settings.Secure.ASSISTED_GPS_ENABLED, 2) == 1); - mAssistedGps.setEnabled(gpsEnabled); + if (mAssistedGps != null) { + mAssistedGps.setChecked(Settings.Secure.getInt(res, + Settings.Secure.ASSISTED_GPS_ENABLED, 2) == 1); + mAssistedGps.setEnabled(gpsEnabled); + } mUseLocation.setChecked(Settings.Secure.getInt(res, Settings.Secure.USE_LOCATION_FOR_SERVICES, 2) == 1); } |