summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/settings/ApplicationSettings.java24
-rw-r--r--src/com/android/settings/applications/RunningServiceDetails.java4
-rw-r--r--src/com/android/settings/fuelgauge/PowerUsageDetail.java4
3 files changed, 16 insertions, 16 deletions
diff --git a/src/com/android/settings/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java
index 27fc3ec..6a17049 100644
--- a/src/com/android/settings/ApplicationSettings.java
+++ b/src/com/android/settings/ApplicationSettings.java
@@ -60,8 +60,8 @@ public class ApplicationSettings extends SettingsPreferenceFragment {
mInstallLocation = (ListPreference) findPreference(KEY_APP_INSTALL_LOCATION);
// Is app default install location set?
- boolean userSetInstLocation = (Settings.System.getInt(getContentResolver(),
- Settings.Secure.SET_INSTALL_LOCATION, 0) != 0);
+ boolean userSetInstLocation = (Settings.Global.getInt(getContentResolver(),
+ Settings.Global.SET_INSTALL_LOCATION, 0) != 0);
if (!userSetInstLocation) {
getPreferenceScreen().removePreference(mInstallLocation);
} else {
@@ -78,18 +78,18 @@ public class ApplicationSettings extends SettingsPreferenceFragment {
protected void handleUpdateAppInstallLocation(final String value) {
if(APP_INSTALL_DEVICE_ID.equals(value)) {
- Settings.System.putInt(getContentResolver(),
- Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_DEVICE);
+ Settings.Global.putInt(getContentResolver(),
+ Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_DEVICE);
} else if (APP_INSTALL_SDCARD_ID.equals(value)) {
- Settings.System.putInt(getContentResolver(),
- Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_SDCARD);
+ Settings.Global.putInt(getContentResolver(),
+ Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_SDCARD);
} else if (APP_INSTALL_AUTO_ID.equals(value)) {
- Settings.System.putInt(getContentResolver(),
- Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
+ Settings.Global.putInt(getContentResolver(),
+ Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
} else {
// Should not happen, default to prompt...
- Settings.System.putInt(getContentResolver(),
- Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
+ Settings.Global.putInt(getContentResolver(),
+ Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
}
mInstallLocation.setValue(value);
}
@@ -121,8 +121,8 @@ public class ApplicationSettings extends SettingsPreferenceFragment {
}
private String getAppInstallLocation() {
- int selectedLocation = Settings.System.getInt(getContentResolver(),
- Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
+ int selectedLocation = Settings.Global.getInt(getContentResolver(),
+ Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
if (selectedLocation == APP_INSTALL_DEVICE) {
return APP_INSTALL_DEVICE_ID;
} else if (selectedLocation == APP_INSTALL_SDCARD) {
diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java
index 555f192..02fbecc 100644
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java
@@ -312,8 +312,8 @@ public class RunningServiceDetails extends Fragment
detail.mReportButton.setOnClickListener(detail);
detail.mReportButton.setText(com.android.internal.R.string.report);
// check if error reporting is enabled in secure settings
- int enabled = Settings.Secure.getInt(getActivity().getContentResolver(),
- Settings.Secure.SEND_ACTION_APP_ERROR, 0);
+ int enabled = Settings.Global.getInt(getActivity().getContentResolver(),
+ Settings.Global.SEND_ACTION_APP_ERROR, 0);
if (enabled != 0 && si != null) {
detail.mInstaller = ApplicationErrorReport.getErrorReportReceiver(
getActivity(), si.mServiceInfo.packageName,
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 0cc58be..4f98163 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -228,8 +228,8 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
mReportButton.setOnClickListener(this);
// check if error reporting is enabled in secure settings
- int enabled = Settings.Secure.getInt(getActivity().getContentResolver(),
- Settings.Secure.SEND_ACTION_APP_ERROR, 0);
+ int enabled = Settings.Global.getInt(getActivity().getContentResolver(),
+ Settings.Global.SEND_ACTION_APP_ERROR, 0);
if (enabled != 0) {
if (mPackages != null && mPackages.length > 0) {
try {