diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-28 07:30:47 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-28 07:30:47 +0000 |
commit | 43b1c4207110942ca90ff74281753ce5df0584ed (patch) | |
tree | 42fdb0fd29dfb99028c4cd903a84d6db997f6770 | |
parent | e2b7042e7647c828441d15e9bde63437e74f8873 (diff) | |
parent | 5cd36407dfdbc1f34a0f28179ab60e61263b7ddd (diff) | |
download | android_development-43b1c4207110942ca90ff74281753ce5df0584ed.tar.gz android_development-43b1c4207110942ca90ff74281753ce5df0584ed.tar.bz2 android_development-43b1c4207110942ca90ff74281753ce5df0584ed.zip |
release-request-7baf6562-f0b7-48e4-8024-f8ee270ffe93-for-git_oc-dr1-release-4140679 snap-temp-L09900000078275654
Change-Id: I07e7a52d55febf4951e707e526ff6866341be00f
-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); |