diff options
| author | bohu <bohu@google.com> | 2017-06-23 14:19:05 -0700 |
|---|---|---|
| committer | bohu <bohu@google.com> | 2017-06-23 14:19:05 -0700 |
| commit | 50dc27b2ca3332a4a6417457c3363ea0f0eb4d98 (patch) | |
| tree | 2f4f039b189195f6ca6d9416ff49b356aed40a8e /apps | |
| parent | 144c55663a4840d373941b76c8ee4728a99d443a (diff) | |
| download | android_development-50dc27b2ca3332a4a6417457c3363ea0f0eb4d98.tar.gz android_development-50dc27b2ca3332a4a6417457c3363ea0f0eb4d98.tar.bz2 android_development-50dc27b2ca3332a4a6417457c3363ea0f0eb4d98.zip | |
Revert "Emulator: update development to 2362bfb6"
It breaks build of docs because SdkSetup has dependency
on gsf-client
This reverts commit 5c26bfa4bc7c873b1d258c7d4cf227a7339d29f7.
Diffstat (limited to 'apps')
| -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); |