Anton Hansson
6ce4d57966
Merge changes from topic "sdksys" am: 0a264aa980 am: 460b007629
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2073609
Change-Id: I393b01c1bc573a4a3a986fdbe73d4a3c2ef84ff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 11:36:22 +00:00
Anton Hansson
f47e5a94b1
Stop building the system-image zip am: 897fe05053 am: 7764ce3cb6
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2073608
Change-Id: Ia0f9f2c544a94ffbe1389ed26279c9b377a6268a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 11:36:18 +00:00
Anton Hansson
460b007629
Merge changes from topic "sdksys" am: 0a264aa980
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2073609
Change-Id: I1b54052b0b9534cbd8c9a2593932bfbb5f049bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 11:18:58 +00:00
Anton Hansson
7764ce3cb6
Stop building the system-image zip am: 897fe05053
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2073608
Change-Id: I672659eb7b2fc57194c9e091bd905e75b0009b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 11:18:52 +00:00
Anton Hansson
0a264aa980
Merge changes from topic "sdksys"
...
* changes:
Remove system-images files from the SDK
Stop building the system-image zip
2022-04-27 10:56:04 +00:00
Neha Jain
c447596560
Update API 33 release config and emulator files for TM Beta2. am: 840de0288b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17945180
Change-Id: Id85d9fc8d8c1672a4f32826b22d22622bd6b3ed5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 00:47:32 +00:00
Neha Jain
840de0288b
Update API 33 release config and emulator files for TM Beta2.
...
Need to update sdk/build_tools_source.prop_template and sdk/platform_source.prop_template since SDK finalization will miss Beta2.
Bug: 229029653
Change-Id: I7fd9c42fe5cee4672d860509d45832266865fbb9
2022-04-25 21:08:58 +00:00
Anton Hansson
ae04c5c358
Remove system-images files from the SDK
...
The system images distributed externally are created by a separate
set of rules than these. There are no known consumers of these
legacy system-image files.
This makes the SDK zip architecture-agnostic.
Bug: 205008975
Test: m sdk sdk_repo dist
Test: diff sdk zips from sdk_phone_arm64 and sdk_phone_x86 (no diff)
Change-Id: I7ba2eb244a5930721c82895cd2947a1d2aff63e2
2022-04-25 16:28:03 +01:00
Anton Hansson
897fe05053
Stop building the system-image zip
...
The system images distributed externally are created by a separate
set of rules than these. There are no known consumers of these
legacy system-image zip files.
Bug: 205008975
Test: m sdk sdk_repo dist
Change-Id: I11a9aaea89c307d4698787e228fb47228244ab74
2022-04-25 16:24:33 +01:00
Treehugger Robot
7c451fc62a
[automerger skipped] Merge "[DO NOT MERGE] Update winscope proxy on R" am: afdc6bc134 am: 3cb8c57463 am: 9ef5036620 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/development/+/2071347
Change-Id: I7180a1597f61d815668fa6fdf8c852e1a9fd7691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 18:26:04 +00:00
Nataniel Borges
701fc3f7b9
[automerger skipped] [DO NOT MERGE] Update winscope proxy on R am: 50775a7444 am: 0043465bcc am: fc37e65e61 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/development/+/2071347
Change-Id: Ic6a136d68575e883a2b8c77892af6158201015aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 18:26:02 +00:00
Treehugger Robot
9ef5036620
Merge "[DO NOT MERGE] Update winscope proxy on R" am: afdc6bc134 am: 3cb8c57463
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2071347
Change-Id: Ibb243e57947005b9589778b92ad8ddf85d8f4a06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 17:52:13 +00:00
Nataniel Borges
fc37e65e61
[DO NOT MERGE] Update winscope proxy on R am: 50775a7444 am: 0043465bcc
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2071347
Change-Id: I0504b1374be2f2bb200ca66ea2d0d9e525af8bf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 17:52:11 +00:00
Treehugger Robot
3cb8c57463
Merge "[DO NOT MERGE] Update winscope proxy on R" am: afdc6bc134
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2071347
Change-Id: I0182232e715485618f97b121b8db908e466a24b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 17:28:26 +00:00
Nataniel Borges
0043465bcc
[DO NOT MERGE] Update winscope proxy on R am: 50775a7444
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2071347
Change-Id: I0fe351a9d58f3eb7658f2e37940bcf8271a84922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 17:28:24 +00:00
Treehugger Robot
afdc6bc134
Merge "[DO NOT MERGE] Update winscope proxy on R"
2022-04-21 17:13:07 +00:00
Nataniel Borges
50775a7444
[DO NOT MERGE] Update winscope proxy on R
...
Backport uspport for device paths with :
Fixes: 196260922
Test: open winscope and collect a trace
Change-Id: Ib2d8088e3a3452c1fea1cccb599dbd9d2ce642d4
2022-04-21 14:32:26 +00:00
Hongwei Wang
a6fffe1eb1
Merge "Integrate custom close action in ApiDemos for PiP" into tm-dev
2022-04-20 17:37:44 +00:00
Treehugger Robot
80e619c871
Merge "Fix incorrect prebuilt-info.txt" am: 6cf816bbcf am: 19cd0dcbd2 am: c9f3141735
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2044647
Change-Id: I8eda30a62a080d3a51b548a33c233352bec9fab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 08:01:27 +00:00
Treehugger Robot
c9f3141735
Merge "Fix incorrect prebuilt-info.txt" am: 6cf816bbcf am: 19cd0dcbd2
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2044647
Change-Id: I4c164e420979ca0fe0cfb796829feb93bfabe944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 07:44:12 +00:00
Treehugger Robot
19cd0dcbd2
Merge "Fix incorrect prebuilt-info.txt" am: 6cf816bbcf
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2044647
Change-Id: I95ec3a0bdbe18f171de08de6ed728fa24d6f6cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 07:16:30 +00:00
Treehugger Robot
6cf816bbcf
Merge "Fix incorrect prebuilt-info.txt"
2022-04-20 06:54:32 +00:00
Hongwei Wang
b5b10c1e42
Integrate custom close action in ApiDemos for PiP
...
The demo Activity simply finishes itself when it receives the callback
from the close action PendingIntent.
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/fR0hxeorlYrxXyzfZ02btK
Bug: 223896879
Test: see video
Change-Id: I94797b666fbcd630c828463668d9bc4e07274cd8
2022-04-19 15:25:54 -07:00
Yi Kong
3c7bcc23bb
Merge "Update clang-tools build to clang-r450784c" am: 0228b3a92e am: a9f1d7ba01 am: 8527613189
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2064972
Change-Id: I2ebe26921d324fd8908d4b2593cb876775f205ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 19:48:49 +00:00
Yi Kong
8527613189
Merge "Update clang-tools build to clang-r450784c" am: 0228b3a92e am: a9f1d7ba01
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2064972
Change-Id: Ie85ccdade3fb131a138e8e0557e2196c5e2f159e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 19:25:49 +00:00
Yi Kong
a9f1d7ba01
Merge "Update clang-tools build to clang-r450784c" am: 0228b3a92e
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2064972
Change-Id: I949df76f81fa5733075631f2815f66d19ce250f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 18:49:36 +00:00
Yi Kong
0228b3a92e
Merge "Update clang-tools build to clang-r450784c"
2022-04-18 18:24:21 +00:00
Yi Kong
76b6aa23c2
Update clang-tools build to clang-r450784c
...
Bug: 219872355
Test: presubmit
Change-Id: I38ce0c3d9ec7d983f7146509c7701b79ba97f531
2022-04-16 22:32:31 +08:00
TreeHugger Robot
9ac33a4a0e
Merge "Support multiple devices in winscope proxy" into tm-dev
2022-04-15 10:57:13 +00:00
Nataniel Borges
241e9e5c08
Support multiple devices in winscope proxy
...
Now, the proxy supports multiple phones connected.
For use with Wayland, only 1 device can be connected
Fixes: 219802355
Test: Collect trace with multiple devices connected
Change-Id: I8f43f2411af10292cf78e2c022a409497cbb69b5
2022-04-14 22:20:34 +02:00
Yurii Zubrytskyi
16c6e8f362
platform/development - Tiramisu is now 33
...
Bug: 225745567
Test: Build
Change-Id: I1c5ae315e87809e2a8ec1bc1295cb5ea6d0cf865
2022-04-11 08:10:42 -07:00
Fangqiu Su
7742e2ea0a
Fix on the failure of the 3 tests in com.android.cts.monkey.CategoryTest class.
...
**This is a duplicate of ag/17623755, which is on the master branch, and this one is for tm-dev branch.**
**Reason of Failure**
This failure is caused by the missing of assigning appropriate categories to different activities in 'development/cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java' file, which is reflected in the update.
The `BaboonActivity` is invoked by the Monkey test program, and therefore should be categorized as `android.intent.category.MONKEY`, which is reflected in 'cts/hostsidetests/monkey/test-apps/CtsMonkeyApp/AndroidManifest.xml' file.
However, in the `MonkeyActivityEvent` class (in 'development/cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java' file), all the `Intent` (equivalent to an event) created by the Monkey test program is still categorized as `android.intent.category.LAUNCHER`. This wrong categorization will raise an error with a message in the log stating that the access to `BaboonActivity` is blocked, and some more messages after will show that the `BaboonActivity` is not actually executed.
The categorizations are defined in 'frameworks/base/core/java/android/content/Intent.java' file.
**Debugging Notes**
1. In `getMainApps()` of 'Monkey.java', the activities (including `BaboonActivity`) are added by their categories. There can be activities under different categories. However, in 'MonkeyActivityEvent.java', all the activities are started under `LAUNCHER` category, despite their original category, which is the point causing the failure.
2. This failure is detected by the intent filter in ag/15419750 and ag/15315839 (using CL Range search between builds 7618377 and 7618385), for more info about intent filter: go for <go/intents-match-intent-filters-guide>.
Fix: 196047981
Test: Use `atest CtsMonkeyTestCases` command, all 10 tests should pass.
Change-Id: Iea4bf2cac5924a193902dd337275d753e0577fa1
2022-04-08 03:01:32 +00:00
Edward Liaw
cac84dd712
Merge "gdbclient: use host ip when connecting to gdb" am: 7a89ee5b1b am: e1113109b9 am: faec52fde5
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2056834
Change-Id: I1ebb396c9532d7447479c7f4d441264980f93d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:59:18 +00:00
Edward Liaw
faec52fde5
Merge "gdbclient: use host ip when connecting to gdb" am: 7a89ee5b1b am: e1113109b9
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2056834
Change-Id: I074fceefa5298c11070e3c2b7890ce93cdb360d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:37:43 +00:00
Edward Liaw
e1113109b9
Merge "gdbclient: use host ip when connecting to gdb" am: 7a89ee5b1b
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2056834
Change-Id: I880ce81d882f7656a70e3c482e102fb1345d9923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:39:12 +00:00
Edward Liaw
7a89ee5b1b
Merge "gdbclient: use host ip when connecting to gdb"
2022-04-07 18:19:33 +00:00
Edward Liaw
22e9c50ec0
gdbclient: use host ip when connecting to gdb
...
When the device is not on localhost, gdbclient won't connect to it
properly. If the serial is a tcp address, parse the host and pass that
to gdb-remote.
Bug: 228371506
Test: gdbclient.py -r /system/bin/ls /bin
Change-Id: I635d4bdc483a66ab908f5aa02aa94e2504976a45
2022-04-07 00:46:07 +00:00
Treehugger Robot
70b6b661f6
Merge "Fix typo in documentation of script acov-llvm.py." am: 721e4ba29e am: 3216ed66b3 am: cd153e83da
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2053953
Change-Id: I8b5ff6e0be6080c9e2280b9aa3ef55b5dabeae4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-05 20:43:03 +00:00
Treehugger Robot
cd153e83da
Merge "Fix typo in documentation of script acov-llvm.py." am: 721e4ba29e am: 3216ed66b3
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2053953
Change-Id: I231dde9cd7d8efd9d0d95664aa882bb36489c122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-05 20:12:37 +00:00
Treehugger Robot
3216ed66b3
Merge "Fix typo in documentation of script acov-llvm.py." am: 721e4ba29e
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2053953
Change-Id: If888fc46743b94d430ffc9a91d108032d2bb3c1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-05 19:46:36 +00:00
Treehugger Robot
721e4ba29e
Merge "Fix typo in documentation of script acov-llvm.py."
2022-04-05 17:06:58 +00:00
Roland Levillain
e6d2736cf4
Fix typo in documentation of script acov-llvm.py.
...
Test: n/a (comment-only change)
Change-Id: I1c10bfd65477dd2550ed86732f9bf077c59b5a59
2022-04-05 11:00:01 +01:00
Xin Li
657be67363
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c045ec9dd2 -s ours am: 5daeacafac -s ours
...
am skip reason: Merged-In I01040f537f57008e11d5aa693591fa8adab2c6b1 with SHA-1 f0651f3179 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17544436
Change-Id: Ic304109a20fa46b2969f845ff542d2acd7b807e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-03 02:52:48 +00:00
Xin Li
5daeacafac
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c045ec9dd2 -s ours
...
am skip reason: Merged-In I01040f537f57008e11d5aa693591fa8adab2c6b1 with SHA-1 f0651f3179 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17544436
Change-Id: I4b98d33d3779de2f94eec99a37ce2221bd26092b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-03 02:30:08 +00:00
Xin Li
c045ec9dd2
Merge Android 12 QPR3 ab/8391262
...
Bug: 226662282
Merged-In: I01040f537f57008e11d5aa693591fa8adab2c6b1
Change-Id: I08cc6f3157b735cf8a59136961de1229c3162443
2022-04-01 20:31:51 +00:00
Rob Seymour
4d47a18e01
Merge "Do not install host snapshot modules with existing prebuilts." am: 3f04ab2fb4 am: 2a581813c8 am: f0651f3179
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2045663
Change-Id: I16e2df57022a3873089471609fa216500ed20eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 01:49:43 +00:00
Rob Seymour
f0651f3179
Merge "Do not install host snapshot modules with existing prebuilts." am: 3f04ab2fb4 am: 2a581813c8
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2045663
Change-Id: I01040f537f57008e11d5aa693591fa8adab2c6b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 01:25:33 +00:00
Rob Seymour
2a581813c8
Merge "Do not install host snapshot modules with existing prebuilts." am: 3f04ab2fb4
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2045663
Change-Id: I7b639fc71bf3ad51aa5e0e4029eb8a149029a04f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 01:06:53 +00:00
Rob Seymour
3f04ab2fb4
Merge "Do not install host snapshot modules with existing prebuilts."
2022-03-30 00:52:39 +00:00
Rob Seymour
01a4f9b2e3
Do not install host snapshot modules with existing prebuilts.
...
Host fake snapshot includes a prebuilt attribute for a host module
that already contains a prebuilt version in the source tree. When
installing the host snapshot ignore any modules that already contains
a prebuilt version.
Bug: 225890931
Test: m HOST_FAKE_SNAPSHOT_ENABLE=true host-fake-snapshot dist
Test: install fake snapshot with update.py and validate prebuilt modules are not included
Change-Id: Ia8bb44c00ad5fc448ab9110d840d9059ae3294f9
2022-03-29 16:09:25 +00:00