diff options
| author | bohu <bohu@google.com> | 2017-06-27 18:58:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-27 18:58:16 +0000 |
| commit | 5cd36407dfdbc1f34a0f28179ab60e61263b7ddd (patch) | |
| tree | 42fdb0fd29dfb99028c4cd903a84d6db997f6770 | |
| parent | 0fc588fb5fe44563d7ab02db3b2e14604f836f2b (diff) | |
| parent | 5856865e3b44fa22424516b19663ce751d6e9605 (diff) | |
| download | android_development-5cd36407dfdbc1f34a0f28179ab60e61263b7ddd.tar.gz android_development-5cd36407dfdbc1f34a0f28179ab60e61263b7ddd.tar.bz2 android_development-5cd36407dfdbc1f34a0f28179ab60e61263b7ddd.zip | |
Revert "Emulator allows google apps to have access to locations by default"
am: 5856865e3b
Change-Id: I3a72cf7169bfb76e2912c1c244f908cf3a259a55
| -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, 0 insertions, 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); |