Commit Graph

31 Commits

Author SHA1 Message Date
Antoan Angelov
b0ed71b318 Merge "Revert "Move SdkSetup.apk to vendor partition""
am: e6964f00a8

Change-Id: Id38c8952fe64a84212907d0c17acf05baf00e897
2018-07-19 06:04:05 -07:00
Antoan Angelov
e867e27a3b Revert "Move SdkSetup.apk to vendor partition"
This reverts commit 3bf31401fe.

Reason for revert: Build cop revert because this change is breaking Blueline builds. 

Change-Id: I54f87f21eec0e93873ffedec6b0bbe154584ba4b
2018-07-19 12:57:33 +00:00
Bowgo Tsai
208ebb195c Merge "Move SdkSetup.apk to vendor partition"
am: 2cf91f337c

Change-Id: I26ab29dda2efe61b2831d4a59062bd97c881218e
2018-07-18 23:30:18 -07:00
Bowgo Tsai
3bf31401fe Move SdkSetup.apk to vendor partition
Otherwise, it causes the CTS-on-GSI failure on non-emulator devices:
  CtsPermission2TestCases android.permission2.cts.PrivappPermissionsTest#testPrivappPermissionsEnforcement

Because non-emulator devices lack the permission file in their /vendor.
  /system/priv-app/SdkSetup/SdkSetup.apk
  /vendor/etc/permissions/privapp-permissions-goldfish.xml

Bug: 110517983
Test: boot a GSI and checks that SdkSetup.apk is moved to /vendor
Change-Id: I3086f99c477eeca38f42041e1809a5aa3b8bfa7a
2018-07-17 18:18:46 +08:00
Roman Kiryanov
b83b0f1f72 Revert "ANDROID: allow using network as a location provider"
This reverts commit 3431578839.

Bug: 72886046
Test: run a cts test
Reason for revert: I found a better fix:
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/3790358
Change-Id: Id2047740e85895868b97b4582903a376c6a49f17
2018-05-14 13:10:03 -07:00
huans
c91a33d3df Change settings only for emulator
Bug: 79584197
Test: Manual
Change-Id: I953bfd4fd6977d5502b511df3bac41d95c35e5fa
2018-05-11 12:26:49 -07:00
bohu
651aad5b02 sdk-img: grant sdksetup app MANAGE_USERS permission
BUG: 76298073
Change-Id: I8ea002b75ce24cb11d5861d0ae131fb7cdbbbd75
2018-03-24 18:04:06 -07:00
Roman Kiryanov
3431578839 ANDROID: allow using network as a location provider
Bug: 72886046
Bug: 66366228
Test: ./android-cts/tools/cts-tradefed run cts -m CtsTelephonyTestCases
Change-Id: I658d0556dfb87ab463f02ec285879caf62c215df
Signed-off-by: Roman Kiryanov <rkir@google.com>
2018-03-22 11:29:22 -07:00
bohu
68b10564cf emulator: enable adb in SdkSetup
(cherry picked from commit 2c111bd94a)

Change-Id: I0b07a23049d7026a9151842be40b345a84e880ff
Merged-In: I8d7f495932da12ba378293282ae8ff8009218e75
2018-03-05 23:32:58 +00:00
bohu
2c111bd94a emulator: enable adb in SdkSetup
Change-Id: I8d7f495932da12ba378293282ae8ff8009218e75
2018-03-05 11:27:25 -08:00
Anton Hansson
44b2e0dfcb development: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.

Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.

Test: make relevant packages
Bug: 73535841
Change-Id: I371bd0b43e66bcc4be1e26decb95c70519ac3342
2018-02-21 19:02:11 +00:00
bohu
9fdedf9df7 emulator: merge oc-emu-dev development project
BUG: 64401460

Change-Id: I3fdce5c8aeb4fccb52d04f5da69807da9c86d57a
Merged-In: I3fdce5c8aeb4fccb52d04f5da69807da9c86d57a
Merged-In: I9f757a14d9bb59db2e6c62f4a4c83a4373b7b4d6
2017-10-26 22:08:12 -07:00
bohu
50dc27b2ca Revert "Emulator: update development to 2362bfb6"
It breaks build of docs because SdkSetup has dependency
on gsf-client

This reverts commit 5c26bfa4bc.
2017-06-23 14:19:05 -07:00
bohu
5c26bfa4bc Emulator: update development to 2362bfb6
Bug: 37302997

oc-emu-dev
commit 2362bfb6d6c4ee4540af5e69130951849c7e109e
Author: bohu <bohu@google.com>
Date:   Thu Apr 6 16:37:48 2017 -0700
Emulator: copy encryptionkey.img to SDK img zip

Change-Id: I057d58733bb39e0777d2f5c9494d5969ac46953a
(cherry picked from commit 6620016eb673ac885e5892604f04d3123a8ee0b9)
2017-06-15 18:13:02 +00:00
bohu
98f2b12a2b Emulator-ATV: Increase SdkSetup HOME intent priority
Increase SdkSetup's HOME intent priority to 3, because
ATV has leanbacklauncher which uses priority 2; So that
ATV can go 'home'
bug: 28432804
Change-Id: I170c8b3fd4d3e82fd09c82e84bb8eeb32bb7c004
2016-04-28 01:47:08 +00:00
bohu
27a9155b7c Emulator: promote SdkSetup app to privileged
SdkSetup app needs to run before the Launcher;
it now has to be privileged to have higher than 0 intent
priority.

bug: 28253210
Change-Id: I4dd971a90685341a3d49e0b525d5ca4a1dda2748
2016-04-20 12:03:02 -07:00
bohu
83529e3a2c Setup flags to make SDK images provisioned.
USER_SETUP_COMPLETE is set to 1 so that the device can be fully functional.

bug: 21164174
Change-Id: Ibd5db3a939df56b8e8963a3fa056db9c49b96f5e
2015-05-21 14:13:05 -07:00
Jeff Sharkey
7b4874660e Clean up Global settings stragglers.
Bug: 7242121
Change-Id: I27fd307e2ee4854558a6f6e4d2fdbbae3e89ffe0
2012-09-26 17:10:48 -07:00
Xavier Ducrohet
71027e1b75 Provision the backup manager in the SDK System image.
Change-Id: Ib1c9ef22558e71452cf979e36dd1d1fdbf844ce8
2010-06-07 19:24:17 -07:00
Ying Wang
36d9f32f07 Fix proguard flags. 2010-02-19 18:47:02 -08:00
Jean-Baptiste Queru
1b9958970b explicit set an "optional" tag 2010-01-05 11:09:46 -08:00
Mike Lockwood
8dc883fe46 AI 144415: am: CL 144372 Cleanup Settings support for enabling and disabling location providers:
LocationManagerService now listens for changes to settings,
  making LocationManager.updateProviders() unnecessary.
  Removed LocationManager.updateProviders()
  Added Settings.Secure.setLocationProviderEnabled(), which is a thread-safe way
  of enabling or disabling a single location provider.
  This is safer than reading, modifying and writing the LOCATION_PROVIDERS_ALLOWED directly.
  BUG=1729031
  Original author: lockwood

Automated import of CL 144415
2009-04-02 23:41:32 -07:00
Dianne Hackborn
5445556edf Automated import from //branches/master/...@140824,140824 2009-03-24 18:36:42 -07:00
The Android Open Source Project
692ab02175 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:11 -07:00
The Android Open Source Project
52d4c30ca5 auto import from //depot/cupcake/@135843 2009-03-03 19:29:09 -08:00
The Android Open Source Project
d4aee0c0ca auto import from //depot/cupcake/@135843 2009-03-03 18:28:16 -08:00
The Android Open Source Project
d2f2b1d7b7 auto import from //depot/cupcake/@132589 2009-03-03 14:03:58 -08:00
The Android Open Source Project
b8747bc7b1 auto import from //depot/cupcake/@137055 2009-03-02 22:54:20 -08:00
The Android Open Source Project
b8d704a517 auto import from //branches/cupcake/...@126645 2009-01-15 16:12:07 -08:00
The Android Open Source Project
e943f2fd8e Code drop from //branches/cupcake/...@124589 2008-12-17 18:04:04 -08:00
The Android Open Source Project
5c11852110 Initial Contribution 2008-10-21 07:00:00 -07:00