Revert "Emulator allows google apps to have access to locations by default"

am: 626b5a3312

Change-Id: I8ddbd1e04421c8eb4cc55aacbf57f494f9065726

apps/SdkSetup/Android.mk

@@ -10,7 +10,4 @@ LOCAL_CERTIFICATE := platform
 
 LOCAL_PROGUARD_ENABLED := disabled
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    gsf-client
-
 include $(BUILD_PACKAGE)

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" />
 

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