diff options
| author | bohu <bohu@google.com> | 2017-04-24 21:01:37 -0700 |
|---|---|---|
| committer | Griff Hazen <griff@google.com> | 2017-06-15 18:13:02 +0000 |
| commit | 5c26bfa4bc7c873b1d258c7d4cf227a7339d29f7 (patch) | |
| tree | 50705914a116f6d469a3d84affaf508d36b454e3 /apps | |
| parent | f0a6169b6c51b8b947adc881560f67ec280f3b02 (diff) | |
| download | android_development-5c26bfa4bc7c873b1d258c7d4cf227a7339d29f7.tar.gz android_development-5c26bfa4bc7c873b1d258c7d4cf227a7339d29f7.tar.bz2 android_development-5c26bfa4bc7c873b1d258c7d4cf227a7339d29f7.zip | |
Emulator: update development to 2362bfb6
Bug: 37302997
oc-emu-dev
commit 2362bfb6d6c4ee4540af5e69130951849c7e109e
Author: bohu <bohu@google.com>
Date: Thu Apr 6 16:37:48 2017 -0700
Emulator: copy encryptionkey.img to SDK img zip
Change-Id: I057d58733bb39e0777d2f5c9494d5969ac46953a
(cherry picked from commit 6620016eb673ac885e5892604f04d3123a8ee0b9)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/SdkSetup/Android.mk | 3 | ||||
| -rw-r--r-- | apps/SdkSetup/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java | 6 |
3 files changed, 10 insertions, 0 deletions
diff --git a/apps/SdkSetup/Android.mk b/apps/SdkSetup/Android.mk index c8b11f68a..16a6e94e5 100644 --- a/apps/SdkSetup/Android.mk +++ b/apps/SdkSetup/Android.mk @@ -10,4 +10,7 @@ LOCAL_CERTIFICATE := platform LOCAL_PROGUARD_ENABLED := disabled +LOCAL_STATIC_JAVA_LIBRARIES := \ + gsf-client + include $(BUILD_PACKAGE) diff --git a/apps/SdkSetup/AndroidManifest.xml b/apps/SdkSetup/AndroidManifest.xml index 8f7268418..4ead2d687 100644 --- a/apps/SdkSetup/AndroidManifest.xml +++ b/apps/SdkSetup/AndroidManifest.xml @@ -18,6 +18,7 @@ package="com.android.sdksetup"> <!-- For miscellaneous settings --> + <uses-permission android:name="com.google.android.providers.settings.permission.WRITE_GSETTINGS" /> <uses-permission android:name="android.permission.WRITE_SETTINGS" /> <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> diff --git a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java index 505a35368..101b3f60a 100644 --- a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java +++ b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java @@ -25,7 +25,9 @@ import android.location.LocationManager; import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.SystemProperties; import android.provider.Settings; +import com.google.android.gsf.UseLocationForServices; /** * Entry point for SDK SetupWizard. @@ -46,6 +48,10 @@ public class DefaultActivity extends Activity { // Not needed since this SDK will contain the Settings app. Settings.Secure.putString(getContentResolver(), Settings.Secure.LOCATION_PROVIDERS_ALLOWED, LocationManager.GPS_PROVIDER); + // Allow google apps to have access to (emulated) location services in emulator + if (SystemProperties.getBoolean("ro.kernel.qemu", false)) { + UseLocationForServices.forceSetUseLocationForServices(this, true); + } // enable install from non market Settings.Global.putInt(getContentResolver(), Settings.Global.INSTALL_NON_MARKET_APPS, 1); |