Commit Graph

574 Commits

Author SHA1 Message Date
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
Ulya Trafimovich
247d38afd5 Add <uses-library> information.
LOCAL_USES_LIBRARIES / LOCAL_OPTIONAL_USES_LIBRARIES should be added to
the app's Android.mk module and should match <uses-library> tags in the
app's manifest, so that the build knows about these libraries and
generates correct class loader context for dexpreopt.

Bug: 132357300
Test: m out/target/common/obj/APPS/Development_intermediates/enforce_uses_libraries.status
Change-Id: Ie5e36dd60040a1e7653acdf882e006de513f5367
2021-05-07 16:13:45 +01:00
Yuntao Xu
c7930a90a8 Merge "Revert "Convert Development/Android.mk to Android.bp"" am: 056344fcf6 am: 8d9b8f017a am: fd54ed89ab
Original change: https://android-review.googlesource.com/c/platform/development/+/1691914

Change-Id: Iaab029e6b836a5e7bfcacedb37934596cc298e20
2021-04-30 20:49:29 +00:00
Yuntao Xu
bdf46bdb5d Revert "Convert Development/Android.mk to Android.bp"
This reverts commit 5ec6ecafd8.

Reason for revert: <cause build breakage>

Change-Id: Ib761f8675b3f09a53f33b786101022de287ac4ea
2021-04-30 18:41:41 +00:00
Yuntao Xu
3a947d831d Merge "Convert Development/Android.mk to Android.bp" am: d0e60e25c2 am: 14b78ea954 am: 9e20f8da4a
Original change: https://android-review.googlesource.com/c/platform/development/+/1688703

Change-Id: Iff74b686ec591b477fe949003f3b7bfe398576ed
2021-04-30 17:50:08 +00:00
Yuntao Xu
5ec6ecafd8 Convert Development/Android.mk to Android.bp
Convert the Make file to a Soong one

Bug: 186677673
Test: compared the two apk files built by Make and Soong
Test: TreeHugger
Change-Id: I5f9580d82b392d3913bed2c4a888928292aea7ac
2021-04-28 16:30:20 -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
Treehugger Robot
c92b60c117 Merge "[SdkSetup] Add open network "AndroidWifi"" am: d69af024bc am: eb2f1dceae am: 88455c3cfa
Original change: https://android-review.googlesource.com/c/platform/development/+/1679686

Change-Id: I38b821d16925f33d6dc8020ffa37b51fa44bf45b
2021-04-26 17:04:13 +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
Treehugger Robot
3291dd14f1 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: e748063d28 am: 347249060a am: dafb7fc537
Original change: https://android-review.googlesource.com/c/platform/development/+/1682225

Change-Id: I8f5e6007cd6803d4dcbfd498045366761be718a2
2021-04-21 20:01:08 +00:00
Bob Badour
40a7447daa [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/Development/Android.mk
  apps/DumpViewer/app/src/main/Android.mk
  apps/OBJViewer/Android.bp
  samples/ApiDemos/Android.mk
  samples/ApiDemos/tests/Android.mk
  samples/HeavyWeight/Android.bp
  samples/IntentPlayground/Android.mk
  samples/MultiClientInputMethod/Android.mk
  samples/MultiDisplay/Android.mk
  samples/MySampleRss/Android.bp
  samples/RenderScript/HelloCompute/Android.mk
  samples/RenderScript/Levels/Android.mk
  samples/ShortcutDemo/launcher/Android.mk
  samples/ShortcutDemo/publisher/Android.mk
  samples/ShortcutSample/Android.mk
  testrunner/tests/Android_java.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I535f73ffa885f723b9dca745f199ce3a3fd409ea
2021-04-20 14:03:26 -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
Chiachang Wang
03a2b4336b Resolve hidden connectivity dependency
ConnectivityManager and NetwokUtils are parts of incoming
Connectivity mainline module. The hidden methods or members are
no longer accessible outside the module. Caller should either
remove or replace the usage.

The override hidden callbacks and INET_CONDITION_ACTION intent
are not really used in the code. Remove the unncessary usage.

The network id is a part of Network.toString(). The network id
is also not necessary.

Bug: 182859030
Test: m
Change-Id: I3a75afb86f5b60ea530b50771bd76887ccf9f271
2021-04-09 06:45:54 +00:00
Treehugger Robot
73272bf578 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: d6b1cbf769 am: 4d108c6ffe am: 483ddf28c8
Original change: https://android-review.googlesource.com/c/platform/development/+/1589100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bfb99db5af219de8b7c6844b99006009152bbe8
2021-02-16 01:02:14 +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
80002baf13 Merge "Rename qemu.keyboard_layout to vendor.qemu.keyboard_layout" am: 9924173829 am: 46681fc0d8 am: 181aa286df
Original change: https://android-review.googlesource.com/c/platform/development/+/1561419

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd06180eac65249dac6b8b2d8f8e570bb858dc32
2021-02-02 01:55:55 +00: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
Treehugger Robot
12bb29668e Merge "Add an explicit android:exported flag." am: a322e3232b am: 10fe66e166 am: 8062c28100
Original change: https://android-review.googlesource.com/c/platform/development/+/1547214

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5731ea89669d8b954f730549e263f4aada37306e
2021-01-12 02:05:41 +00: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
Gopinath Elanchezhian
544b9f0fdc Make Development test app S+ compatible.
android:exported attribute is mandatory.
Related to b/150232615

Bug: b/171566956

Test: Development apk builds and install fine in S+ builds.
Change-Id: I10ac27d187e3b5404bc6eff3d40ca67f3786888d
2020-11-12 10:54:00 -08:00
Xin Li
e3b57410da Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I37a77cdaf905fe0bf58ad8eebcdff36873aec71a
Change-Id: Idac9218a0e169df9d02d9d8d376a6816315a4b28
2020-08-27 10:16:04 -07:00
Treehugger Robot
4f2eb07963 Merge "Update language to comply with Android’s inclusive language guidance" am: aace0e5dad am: 762e462fea
Original change: https://android-review.googlesource.com/c/platform/development/+/1381456

Change-Id: I31b165b51d8a4caa87daf3341fb7eeeb8962e520
2020-07-31 17:01:22 +00:00
Jeff Sharkey
29bc7dcc26 Update language to comply with Android’s inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Change-Id: I56dd8778516103367dc17ae55bdff4457185de46
2020-07-30 20:05:08 -06: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
0a02296a62 Merge "[SdkSetup] Disable Offload Tethering" am: c3db8555b4 am: 9e6a2bd5ad
Change-Id: I34cdd7099a41e23fe21cdac7b9eb205fcc23d077
2020-03-31 02:18:02 +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
Automerger Merge Worker
af6230c3bd Merge "Move the app to /system_ext" am: eaee8a5229 am: 86783efdf4 am: 956724b58a
Change-Id: I26c0a9ef03959256fe732a5b3a13fbd3182d7344
2019-12-31 19:30:36 +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
Automerger Merge Worker
483bf94fe4 Merge "[Bug Fix] Not able to create secondary user due to lack of permission" am: 3addde7f6b am: 98c3040b52 am: 61cb8f964c
Change-Id: I19980209284d6740b576515bfd55ef09512bd648
2019-12-12 03:00:37 +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
David Su
6e08a584fb Migrate to official API getWifiActivityEnergyInfoAsync()
getControllerActivityEnergyInfo() is an @hide API,
migrate to getWifiActivityEnergyInfoAsync() which is an
@SystemApi.

Bug: 145244073
Test: m Development && adb install Development.apk,
open Dev Tools app, go to Connectivity page, tap on
Link Stats button, ensure link stats printed in text
box below.

Change-Id: I0a9edfff7d924a31c5a3470a89e03bd161f1a8fb
2019-12-04 16:36:03 -08:00
David Su
3c48b7354e Move WifiActivityEnergyInfo to android.os.connectivity
Fix import of WifiActivityEnergyInfo to package
android.os.connectivity

Bug: 145244073
Test: compiles
Change-Id: Ibe16e826bde9017df989e12289b2961a18fab281
2019-12-03 22:31:24 -08:00
Weilun Du
8810570222 Merge "[SdkSetup] Set physical keyboard layout"
am: c3aecfaf2e

Change-Id: I8ad6436164705d7c18d68706ef2266f46664e829
2019-11-14 18:17:57 -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
Weilun Du
7b0baf44b5 [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

Change-Id: Iad3750af5383ba27fbf20eb9b26652f037853f1f
Signed-off-by: Weilun Du <wdu@google.com>
2019-11-11 19:43:38 +00:00
Xin Li
4ccc65c62e DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: Ia918710dfff36bdc415863a7490a72d7b98f66ad
2019-10-30 11:46:47 -07:00
bohu
76c4f8f1c0 emulator: move SdkSetup to product
Change-Id: I32d9b486ea131e0bd40e3714c83009faa13d592a
Merged-In: I32d9b486ea131e0bd40e3714c83009faa13d592a
2019-10-28 09:15:27 -07:00
bohu
1440c5aa5a emulator: move SdkSetup to product
Change-Id: I32d9b486ea131e0bd40e3714c83009faa13d592a
2019-10-26 23:30:54 -07:00
Bill Yi
560a83674f Import translations. DO NOT MERGE
Change-Id: I12508fbb7397a8cdd7dd22a2c30ce9229548b7b1
Auto-generated-cl: translation import
2019-10-15 14:50:47 -07:00
Bill Yi
ca7c713d45 Import translations. DO NOT MERGE
Change-Id: I5e33ae9d1117e0459d01f8d02157578f35760d16
Auto-generated-cl: translation import
2019-09-24 19:39:27 -07:00
gopinath
fdf10818e5 Remove Local compatibility suite from Developement app.
Bug: b/139647239

Test: Builds development app successfully.
Change-Id: Iad56df9b9098b5860f1f61b578db774f3a9775bf
2019-08-22 21:44:45 +00:00
gopinath
402e9c8c7c Remove Local compatibility suite from Developement app.
Bug: b/139647239

Test: Builds development app successfully.
Change-Id: Iad56df9b9098b5860f1f61b578db774f3a9775bf
2019-08-22 14:19:58 -07:00
Bill Yi
dacfa5f1a2 Import translations. DO NOT MERGE
Change-Id: If8114e9158c167b90ebe82b4b90f5550b3cc7052
Auto-generated-cl: translation import
2019-08-21 21:46:56 -07:00
Neil Fuller
2c8aae5dd3 Merge "Remove unused import" 2019-07-04 09:13:07 +00:00
Neil Fuller
61165ed11a Remove unused import
Bug: 16550209
Test: build / boot / treehugger
Change-Id: I559afeba4532520185a659f425f8e052682d5323
2019-07-03 18:02:39 +01: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
Steven Moreland
c33f3327aa Merge "Remove unused import of ServiceManagerNative." am: 9958d0da90
am: 9a67b9d69e

Change-Id: Ibedc16800360be966fb3e47a802f58147775c461
2019-06-22 17:14:15 -07:00
Steven Moreland
bdc5faa067 Remove unused import of ServiceManagerNative.
Bug: 135768100
Test: N/A
Change-Id: Ieb11d0a7b083ba2518047596241d31887f81a916
2019-06-21 15:37:20 -07:00
Xin Li
f5d0a65e40 DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
Bug: 132622481
Change-Id: Ic40523fde41ba87e570f3992b644a31e53265d62
2019-05-13 15:38:44 -07:00