From 5856865e3b44fa22424516b19663ce751d6e9605 Mon Sep 17 00:00:00 2001
From: bohu <bohu@google.com>
Date: Sat, 3 Jun 2017 23:31:59 -0700
Subject: [PATCH] Revert "Emulator allows google apps to have access to
 locations by default"

The SdkSetup apk is included by AOSP images and it should not
refers to google apks.

We need to figure out different way to fix the original GTS failure.

BUG: 62292257

This reverts commit fb743d8db6e755e98251e6509a09aed6d51f76d4.
(cherry picked from commit 03f4e91d52fbd994e0c11ddf537ad767e8c14bde)

Change-Id: I87c4dcefc6b51890d4edcd2749eee2fbdb7fc8a0
---
 apps/SdkSetup/Android.mk                                    | 3 ---
 apps/SdkSetup/AndroidManifest.xml                           | 1 -
 apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java | 6 ------
 3 files changed, 10 deletions(-)

diff --git a/apps/SdkSetup/Android.mk b/apps/SdkSetup/Android.mk
index 16a6e94e5..c8b11f68a 100644
--- a/apps/SdkSetup/Android.mk
+++ b/apps/SdkSetup/Android.mk
@@ -10,7 +10,4 @@ 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 4ead2d687..8f7268418 100644
--- a/apps/SdkSetup/AndroidManifest.xml
+++ b/apps/SdkSetup/AndroidManifest.xml
@@ -18,7 +18,6 @@
         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 101b3f60a..505a35368 100644
--- a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
+++ b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
@@ -25,9 +25,7 @@ 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.
@@ -48,10 +46,6 @@ 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);