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)

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);