Commit Graph

56 Commits

Author SHA1 Message Date
Xin Li
c081864bf3 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I9b94d270148d8ce5fa97f88f460d8c03eac3873c
Change-Id: I34852886e6e98d2964318d6fcc6ebd7292e47544
2022-02-11 06:56:24 +00:00
Bob Badour
082705bfb3 Fix license texts.
Push specific licenses down the tree toward the leaf directories.

Remove extra Apache 2.0 license texts--just use Android-Apache-2.0

Test: m nothing
Change-Id: Ibee25f75f5933699d6f43acdc192b2ada6823757
2022-01-20 19:04:52 +00:00
Huan Song
7085983d97 Enable "auto rotate" for resizable AVD
Bug: 202734687

Test: run resizable AVD
Change-Id: I3b104fe680e1c706ce11974473140dfbbb1a83ff
2021-10-11 13:00:28 -07:00
Bo Hu
b2f5d3e98c Merge "emulator: disable setting NR as network type" am: 2f2313d01c
Original change: https://android-review.googlesource.com/c/platform/development/+/1807202

Change-Id: Ie932a37d5eedc6b3fd9d01777f0f729847bd4742
2021-08-26 17:09:04 +00:00
Bo Hu
ba5a679a01 Refix "emulator: disable setting NR as network type"
original cl fe4b1d85fa
does not fix the issue

Bug: 193418404
Bug: 197422016

Change-Id: I683b3d3057bcefc14a91ecbbd2e76700cc9c2872
2021-08-25 22:27:34 +00:00
bohu
fe83c41c1d emulator: disable setting NR as network type
It appears to be blocking and prevents sdksetup app from
responding.

Disable it for now.

Bug: 193418404
Bug: 197422016
Change-Id: I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c
Merged-In: I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c
2021-08-25 00:12:05 +00:00
bohu
136600a181 emulator: disable setting NR as network type
It appears to be blocking and prevents sdksetup app from
responding.

Disable it for now.

Bug: 193418404
Bug: 197422016
Change-Id: I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c
Merged-In: I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c
2021-08-24 22:46:16 +00:00
Weilun Du
c9c6c19f5d [SdkSetup] Clean up
1, Fixed AndroidManifests.xml parsing error.
2, Connect to AndroidWifi access point for emulator only.

Bug: 185242318

Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: I5d4863b3c5aba8e7dfccdd061739afe30ded5162
2021-07-01 16:50:21 -07:00
Weilun Du
7da6c1129d Merge "[SdkSetup] Clean up" am: 6105088a62 am: 46fcb826fd
Original change: https://android-review.googlesource.com/c/platform/development/+/1752700

Change-Id: I64010d78e99b87c6511a3d7052042cbbcc047b2a
2021-07-01 01:22:25 +00:00
Weilun Du
933390bb0f [SdkSetup] Clean up
1, Fixed AndroidManifests.xml parsing error.
2, Connect to AndroidWifi access point for emulator only.

Bug: 185242318

Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: I5d4863b3c5aba8e7dfccdd061739afe30ded5162
2021-06-30 15:09:58 -07:00
TreeHugger Robot
9b4e646bda Merge "Sdksetup: Set path for display settings file for freeform display" into sc-dev 2021-04-26 17:42:38 +00:00
Weilun Du
cedad08727 [SdkSetup] Add open network "AndroidWifi"
Instead of relying on WifiConfigStore.xml, we configure Wifi in SdkSetup
to make data partition empty at build team.

Bug: 185242318

Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: I0f5d7f3a6e67414f4213f98b7f3b0b19e7cc129c
2021-04-23 22:54:21 -07:00
Huan Song
a9fde290dd Sdksetup: Set path for display settings file for freeform display
Bug: 183668221

Test: config emualtor with display.settings.xml=freeform, run emulator
Change-Id: I7c303c82c07e467bdb4a3b587bbd2ef6d1e61ae5
2021-04-20 16:54:19 +00:00
Bob Badour
f7cf305656 [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/BluetoothDebug/Android.bp
  apps/BuildWidget/Android.bp
  apps/CustomLocale/Android.bp
  apps/DevelopmentSettings/Android.bp
  apps/Fallback/Android.bp
  apps/GestureBuilder/Android.bp
  apps/NinePatchLab/Android.bp
  apps/OBJViewer/Android.bp
  apps/PushApiAuthenticator/Android.bp
  apps/PushApiTestAppOne/Android.bp
  apps/PushApiTestAppTwo/Android.bp
  apps/SdkSetup/Android.bp
  apps/SettingInjectorSample/Android.bp
  apps/WidgetPreview/Android.bp
  apps/launchperf/Android.bp
  cmds/monkey/Android.mk
  gsi/gsi_util/Android.bp
  gsi/repack_super_image/Android.bp
  host/windows/Android.bp
  python-packages/Android.bp
  samples/AccelerometerPlay/Android.bp
  samples/AdaptiveIconSample/Android.bp
  samples/AliasActivity/Android.bp
  samples/AndroidBeamDemo/Android.bp
  samples/AppNavigation/Android.bp
  samples/AutofillKeyboard/Android.bp
  samples/BackupRestore/Android.bp
  samples/BasicGLSurfaceView/Android.bp
  samples/BluetoothChat/Android.bp
  samples/BrokenKeyDerivation/Android.bp
  samples/BrokenKeyDerivation/tests/Android.bp
  samples/BusinessCard/Android.bp
  samples/Compass/Android.bp
  samples/ContactManager/Android.bp
  samples/CubeLiveWallpaper/Android.bp
  samples/DataWiper/Android.bp
  samples/DeviceAdminWhitelistedAccount/Android.bp
  samples/FixedGridLayout/Android.bp
  samples/HeavyWeight/Android.bp
  samples/HelloActivity/Android.bp
  samples/HelloActivity/tests/Android.bp
  samples/HelloEffects/Android.bp
  samples/Home/Android.bp
  samples/HoneycombGallery/Android.bp
  samples/InlineFillService/Android.bp
  samples/JetBoy/Android.bp
  samples/LceDemo/Android.bp
  samples/LunarLander/Android.bp
  samples/LunarLander/tests/Android.bp
  samples/MultiResolution/Android.bp
  samples/MultiWindow/Android.bp
  samples/MySampleRss/Android.bp
  samples/NotePad/Android.bp
  samples/Obb/Android.bp
  samples/RSSReader/Android.bp
  samples/ReceiveShareDemo/Android.bp
  samples/SampleSyncAdapter/Android.bp
  samples/SimpleJNI/Android.bp
  samples/SimpleJNI/jni/Android.bp
  samples/SipDemo/Android.bp
  samples/SkeletonApp/Android.bp
  samples/SkeletonApp/tests/Android.bp
  samples/Snake/Android.bp
  samples/Snake/tests/Android.bp
  samples/SoftKeyboard/Android.bp
  samples/SpellChecker/HelloSpellChecker/Android.bp
  samples/SpellChecker/SampleSpellCheckerService/Android.bp
  samples/StackWidget/Android.bp
  samples/ThemedNavBarKeyboard/Android.bp
  samples/ToyVpn/Android.bp
  samples/TtsEngine/Android.bp
  samples/USB/AdbTest/Android.bp
  samples/USB/MissileLauncher/Android.bp
  samples/UiAutomator/Android.mk
  samples/Vault/Android.bp
  samples/Vault/tests/Android.bp
  samples/VoiceRecognitionService/Android.bp
  samples/VoicemailProviderDemo/Android.bp
  samples/WeatherListWidget/Android.bp
  samples/WiFiDirectDemo/Android.bp
  samples/WiFiDirectServiceDiscovery/Android.bp
  samples/Wiktionary/Android.bp
  samples/WiktionarySimple/Android.bp
  samples/XmlAdapters/Android.bp
  samples/apkcachetest/Android.bp
  samples/training/NsdChat/Android.bp
  scripts/Android.bp
  testrunner/Android.mk
  testrunner/tests/Android_native.mk
  tools/apkcheck/Android.bp
  tools/bugreport/Android.bp
  tools/etc1tool/Android.bp
  tools/idegen/Android.bp
  tools/mkstubs/Android.bp
  tools/rmtypedefs/Android.bp
  vndk/Android.bp
  vndk/tools/Android.bp
  vndk/tools/elfcheck/Android.bp
  vndk/tools/header-checker/Android.bp
  vndk/tools/header-checker/src/repr/protobuf/proto/Android.bp
  vndk/tools/header-checker/tests/integration/ifunc/Android.bp
  vndk/tools/header-checker/tests/integration/version_script_example/Android.bp
  vndk/tools/image-diff-tool/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CPL-1.0 SPDX-license-identifier-MIT
    SPDX-license-identifier-Unicode-DFS SPDX-license-identifier-W3C
    legacy_restricted legacy_unencumbered
to:
  Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CPL-1.0
to:
  samples/SearchableDictionary/Android.bp

Added SPDX-license-identifier-Apache-2.0 legacy_unencumbered
to:
  tools/Android.bp

Added SPDX-license-identifier-BSD SPDX-license-identifier-CPL-1.0
    SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS
    SPDX-license-identifier-W3C
to:
  sdk/Android.bp

Added legacy_restricted
to:
  samples/KeyChainDemo/Android.bp
  tools/line_endings/Android.bp
  vndk/tools/definition-tool/datasets/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I9847e00fb4278bc083b4debbc751003c995ea45c
2021-02-12 17:13:45 -08:00
Weilun Du
b7e6e532da Rename qemu.keyboard_layout to vendor.qemu.keyboard_layout
Bug: 178143857

Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: I27170464b9a8301ca56bd333a3e5304b8290008e
2021-01-26 21:27:46 -08:00
Kenneth Magic
0d61a590a7 Add an explicit android:exported flag.
This is now required otherwise the package will fail to install.
The failure is preventing adb from being enabled in user builds.

Bug: 176424685
Test: Checked ADB is available without user intervention.
Change-Id: I87be39e24e08bd0c100f4263be1db40daa7cef7a
2021-01-11 15:08:52 -08:00
bohu
2e90b7b031 emulator: setup preferred network mode to 5g(NR)
BUG: 158040335

This will ensure the phone is using the 5g(NR)
as the preferred network mode.

User can change it in setting later, if desired.

Change-Id: I69583d1769739124a51355ff8b887e727ba61df8
Merged-In: I69583d1769739124a51355ff8b887e727ba61df8
2020-06-05 15:58:45 +00:00
Weilun Du
c734c3fc01 [SdkSetup] Disable Offload Tethering
Unbreak emulator system crash when WiFi tethering switch is turned
on in Settings app.

BUG: 150408099

Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: I893258171c9a6aa4659c8a636f410414c0216d41
2020-03-30 21:17:07 +00:00
Jeongik Cha
b7aa057aa1 Move the app to /system_ext
As mentioned in go/partitions-in-r, we plan to forbid hidden API in
product partition.
So this app should be moved to /system_ext because it uses hidden API.
It is not permanent, so they can be moved back to /product due to
needs if there isn't hidden usage anymore.

Bug: 137908189
Test: m
Test: check whether device boots successfully
Change-Id: Id1e897eadea814b780f199fa7f3d683924eb4ab3
2019-12-30 04:42:01 +00:00
Weilun Du
aa2ec781e8 [Bug Fix] Not able to create secondary user due to lack of permission
BUG: 145353724

Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: Icce8f6d280b29c4390dcd5947516a06448799862
2019-12-11 09:58:45 -08:00
Weilun Du
3cac24167f [SdkSetup] Set physical keyboard layout
Emulator host will set the guest keyboard layout with boot
properties based on the host keyboard layout.

Also, fixed complaints in setting properties adb_enabled and
install_non_market_apps.

BUG: 78115103
Merged-In: Iad3750af5383ba27fbf20eb9b26652f037853f1f
Change-Id: Iad3750af5383ba27fbf20eb9b26652f037853f1f
Signed-off-by: Weilun Du <wdu@google.com>
2019-11-12 10:08:09 -08:00
bohu
76c4f8f1c0 emulator: move SdkSetup to product
Change-Id: I32d9b486ea131e0bd40e3714c83009faa13d592a
Merged-In: I32d9b486ea131e0bd40e3714c83009faa13d592a
2019-10-28 09:15:27 -07:00
Alexander Smundak
dc5a7ea905 Merge "Convert Android.mk files to Android.bp" am: 1ccb28f28a
am: aabc1be2ea

Change-Id: Ic2e36324d145bc7ff064647b8304f548235382aa
2019-06-27 09:34:48 -07:00
Sasha Smundak
bef01b9173 Convert Android.mk files to Android.bp
See build/soong/README.md for more information.

Bug: 122332515
Test: treehugger
Change-Id: I0f6ae8d880114d1bc83f7aac2b96eafef76dc046
2019-06-25 14:18:16 -07:00
Chandan Nath
89231b9e44 [Backup cleanup] remove call to no-op method setBackupProvisioned
Bug: 120120742

Test: 1) atest RunBackupFrameworksServicesRoboTests
2) atest $(find \
frameworks/base/services/tests/servicestests/src/com/android/server/backup \
-name '*Test.java')

Change-Id: I9d6d312f32d79646384adb60726e4c12ee12c052
2018-12-20 16:34:22 +00:00
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