Commit Graph

32885 Commits

Author SHA1 Message Date
Hongwei Wang
65ac62aead Merge "Integrate custom close action in ApiDemos for PiP" into tm-dev am: a6fffe1eb1 am: d959cfdd1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17716502

Change-Id: I069a6e0013c723eecec297b24ab86b3a4ab99c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:38:57 +00:00
Hongwei Wang
d959cfdd1d Merge "Integrate custom close action in ApiDemos for PiP" into tm-dev am: a6fffe1eb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17716502

Change-Id: Ica4c1a5658e2325df1371d822ac1c7bfa2dbe5c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 17:46:00 +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
2ea2b7f01e Merge "Fix incorrect prebuilt-info.txt" am: 6cf816bbcf am: 19cd0dcbd2 am: c9f3141735 am: 80e619c871 am: 8feedb7222
Original change: https://android-review.googlesource.com/c/platform/development/+/2044647

Change-Id: I663adcde0c43136d7fd3c331889de8b13ced3b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 11:50:20 +00:00
Treehugger Robot
8feedb7222 Merge "Fix incorrect prebuilt-info.txt" am: 6cf816bbcf am: 19cd0dcbd2 am: c9f3141735 am: 80e619c871
Original change: https://android-review.googlesource.com/c/platform/development/+/2044647

Change-Id: I585401ef2591e54a4fe562c1f8fb68efcff36910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 09:06:48 +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
b37a68d29b Merge "Update clang-tools build to clang-r450784c" am: 0228b3a92e am: a9f1d7ba01 am: 8527613189 am: 3c7bcc23bb am: 09b563f29e
Original change: https://android-review.googlesource.com/c/platform/development/+/2064972

Change-Id: I910627590d56f418c45493f8f75bee5b8aa85815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 20:27:35 +00:00
Yi Kong
09b563f29e Merge "Update clang-tools build to clang-r450784c" am: 0228b3a92e am: a9f1d7ba01 am: 8527613189 am: 3c7bcc23bb
Original change: https://android-review.googlesource.com/c/platform/development/+/2064972

Change-Id: I73d6efc7badd78f4502496b898c18fe88ec8eb64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 20:04:59 +00: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
90c577d556 Merge "Support multiple devices in winscope proxy" into tm-dev am: 9ac33a4a0e am: 08a7addcc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17760468

Change-Id: I08d13623eace16ad70eacbcd429d87e833fb7e38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 11:37:31 +00:00
TreeHugger Robot
08a7addcc3 Merge "Support multiple devices in winscope proxy" into tm-dev am: 9ac33a4a0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17760468

Change-Id: I813acbb37afe1977799ef0a43ef6146f3a44b5c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 11:16:23 +00: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
f428cb6105 platform/development - Tiramisu is now 33 am: 16c6e8f362 am: 57a18247f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17582684

Change-Id: Iffdea0ae9e9ff0ed7ff3b32088dba7d407c70bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 06:41:46 +00:00
Yurii Zubrytskyi
57a18247f9 platform/development - Tiramisu is now 33 am: 16c6e8f362
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17582684

Change-Id: I46722e09b396c78b3d0b8d2e0961e3799a00a029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 06:26:17 +00: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
260cb56657 Fix on the failure of the 3 tests in com.android.cts.monkey.CategoryTest class. am: 7742e2ea0a am: 19a7bed53f
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17650269

Change-Id: I2261be89cde6ee8733f3d7fb6c176821a22f01a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-09 00:50:25 +00:00
Fangqiu Su
19a7bed53f Fix on the failure of the 3 tests in com.android.cts.monkey.CategoryTest class. am: 7742e2ea0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17650269

Change-Id: Ifa6d9378aca38ef6586ced8519d9a70c93df3d78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-09 00:28:15 +00: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
6420cf5497 Merge "gdbclient: use host ip when connecting to gdb" am: 7a89ee5b1b am: e1113109b9 am: faec52fde5 am: cac84dd712 am: 76cb22b7a8
Original change: https://android-review.googlesource.com/c/platform/development/+/2056834

Change-Id: Ifb74ffe6545740543c70355406d41fc1a2b1d4f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 21:07:33 +00:00
Edward Liaw
76cb22b7a8 Merge "gdbclient: use host ip when connecting to gdb" am: 7a89ee5b1b am: e1113109b9 am: faec52fde5 am: cac84dd712
Original change: https://android-review.googlesource.com/c/platform/development/+/2056834

Change-Id: Ib293bdb34b6e1413d4f758e2f3eb48d8eb6909c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 20:42:19 +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
e7f8e6f11d Merge "Fix typo in documentation of script acov-llvm.py." am: 721e4ba29e am: 3216ed66b3 am: cd153e83da am: 70b6b661f6 am: d381506987
Original change: https://android-review.googlesource.com/c/platform/development/+/2053953

Change-Id: I67199ceeee8cf51609822f07fb43bfbb367516ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 21:28:40 +00:00
Treehugger Robot
d381506987 Merge "Fix typo in documentation of script acov-llvm.py." am: 721e4ba29e am: 3216ed66b3 am: cd153e83da am: 70b6b661f6
Original change: https://android-review.googlesource.com/c/platform/development/+/2053953

Change-Id: I657e303fe6ddd1c3173eef4f77214fd4306e0ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 21:06:25 +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
22fb444915 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c045ec9dd2 -s ours am: 5daeacafac -s ours am: 657be67363 -s ours am: f7373ab381 -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: I701adcf24e4c0219c2eaf9ddb1ce4df7102ac74a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 03:46:40 +00:00
Xin Li
f7373ab381 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c045ec9dd2 -s ours am: 5daeacafac -s ours am: 657be67363 -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: Ia7638f9b298a77682b99f02bf6b962cad0f0c901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 03:15:54 +00: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