summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-09-25 17:07:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-25 17:07:39 -0700
commit1485060f8a4526c39d625d6247ae3e39ff1a4b64 (patch)
tree3854d7cff0c6189efe00e88dec7f07dab1fa84eb
parent3c9904e5f7d7da7c9de5637df685737762683e0f (diff)
parent4dca31bdc6ef612c8c77af14dc5f700c32fa938e (diff)
downloadandroid_packages_apps_PackageInstaller-1485060f8a4526c39d625d6247ae3e39ff1a4b64.tar.gz
android_packages_apps_PackageInstaller-1485060f8a4526c39d625d6247ae3e39ff1a4b64.tar.bz2
android_packages_apps_PackageInstaller-1485060f8a4526c39d625d6247ae3e39ff1a4b64.zip
am 4dca31bd: Merge "Update references to migrated global settings." into jb-mr1-dev
* commit '4dca31bdc6ef612c8c77af14dc5f700c32fa938e': Update references to migrated global settings.
-rw-r--r--src/com/android/packageinstaller/PackageInstallerActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index 93a52dff..d3b2a947 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -429,8 +429,8 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
}
private boolean isInstallingUnknownAppsAllowed() {
- return Settings.Secure.getInt(getContentResolver(),
- Settings.Secure.INSTALL_NON_MARKET_APPS, 0) > 0;
+ return Settings.Global.getInt(getContentResolver(),
+ Settings.Global.INSTALL_NON_MARKET_APPS, 0) > 0;
}
private void initiateInstall() {