Commit Graph

32029 Commits

Author SHA1 Message Date
Anton Hansson
29d3b22bf9 Merge "Add sdk extension version info to prop templates" into sc-dev-plus-aosp am: 538c18b677 am: 310344483f am: f9355bc2cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684826

Change-Id: I78a43228828ae28c503856ce30ecfebee97fb768
2021-08-31 11:26:02 +00:00
Anton Hansson
f9355bc2cc Merge "Add sdk extension version info to prop templates" into sc-dev-plus-aosp am: 538c18b677 am: 310344483f
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684826

Change-Id: I3ab61a92dff6b16de8b462b0c530ac198465979f
2021-08-31 11:10:51 +00:00
Anton Hansson
310344483f Merge "Add sdk extension version info to prop templates" into sc-dev-plus-aosp am: 538c18b677
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684826

Change-Id: I0fe4d2483adf6151a9ad65daa90f56aeb7149b38
2021-08-31 10:59:03 +00:00
Anton Hansson
538c18b677 Merge "Add sdk extension version info to prop templates" into sc-dev-plus-aosp 2021-08-31 10:15:34 +00:00
Joel Galenson
d412983c23 Merge "Let the test mapping updater handle newly-added files." am: 23d41df362 am: 194b0f6ef7 am: 83135cb01e am: 85c4380dd6 am: a2cee68264
Original change: https://android-review.googlesource.com/c/platform/development/+/1813597

Change-Id: I60681a476b27b533472fa1c8ac0f2bca82ab5d94
2021-08-30 21:04:34 +00:00
Joel Galenson
a2cee68264 Merge "Let the test mapping updater handle newly-added files." am: 23d41df362 am: 194b0f6ef7 am: 83135cb01e am: 85c4380dd6
Original change: https://android-review.googlesource.com/c/platform/development/+/1813597

Change-Id: Ife47ba3e780e4cd453e0123eca8ca14c7eb0ef84
2021-08-30 20:47:46 +00:00
Joel Galenson
85c4380dd6 Merge "Let the test mapping updater handle newly-added files." am: 23d41df362 am: 194b0f6ef7 am: 83135cb01e
Original change: https://android-review.googlesource.com/c/platform/development/+/1813597

Change-Id: Ia13d971cd09d5c06e88bd50a75c820b8b236d0d5
2021-08-30 20:39:32 +00:00
Joel Galenson
83135cb01e Merge "Let the test mapping updater handle newly-added files." am: 23d41df362 am: 194b0f6ef7
Original change: https://android-review.googlesource.com/c/platform/development/+/1813597

Change-Id: Iac96a37a02c7e9322cf994427bbd5488b9e3d19f
2021-08-30 20:22:06 +00:00
Joel Galenson
194b0f6ef7 Merge "Let the test mapping updater handle newly-added files." am: 23d41df362
Original change: https://android-review.googlesource.com/c/platform/development/+/1813597

Change-Id: I1024a0460df86b09a5565fccea03a22e20d9a28b
2021-08-30 20:06:49 +00:00
Treehugger Robot
dcda9e7c37 Merge "Stop hardcoding a keypath in OTA generator" am: f1a77506eb am: cb2bd4fb80 am: 2399efab64 am: 6ead11dd5a am: b5f586140c
Original change: https://android-review.googlesource.com/c/platform/development/+/1811896

Change-Id: I282b9dc62b137cef22326e9ce53b70467062c7c2
2021-08-30 20:06:19 +00:00
Treehugger Robot
b5f586140c Merge "Stop hardcoding a keypath in OTA generator" am: f1a77506eb am: cb2bd4fb80 am: 2399efab64 am: 6ead11dd5a
Original change: https://android-review.googlesource.com/c/platform/development/+/1811896

Change-Id: I01ca0ed04190051a156bad7e4e9ab5f3c0416dcb
2021-08-30 19:48:38 +00:00
Joel Galenson
23d41df362 Merge "Let the test mapping updater handle newly-added files." 2021-08-30 19:47:01 +00:00
Treehugger Robot
6ead11dd5a Merge "Stop hardcoding a keypath in OTA generator" am: f1a77506eb am: cb2bd4fb80 am: 2399efab64
Original change: https://android-review.googlesource.com/c/platform/development/+/1811896

Change-Id: I21712400cc9692276cd4e436a78cf1cc2713b01c
2021-08-30 19:31:41 +00:00
Treehugger Robot
2399efab64 Merge "Stop hardcoding a keypath in OTA generator" am: f1a77506eb am: cb2bd4fb80
Original change: https://android-review.googlesource.com/c/platform/development/+/1811896

Change-Id: I199d7223c6bf72c46a9ed09b507f71c4280b4d30
2021-08-30 19:08:10 +00:00
Treehugger Robot
cb2bd4fb80 Merge "Stop hardcoding a keypath in OTA generator" am: f1a77506eb
Original change: https://android-review.googlesource.com/c/platform/development/+/1811896

Change-Id: I1fb1e796e10ed5b31a210375c1707721735fa856
2021-08-30 18:33:13 +00:00
Treehugger Robot
f1a77506eb Merge "Stop hardcoding a keypath in OTA generator" 2021-08-30 18:12:38 +00:00
Joel Galenson
bdf3ab4d8e Let the test mapping updater handle newly-added files.
The previous commit to this file allowed it to create and upload a
commit when a TEST_MAPPING file changed.  But it did not handle the
case where the TEST_MAPPING file did not previously exist.  This fixes
that.

Test: Run script.
Change-Id: Id7b9e778c2b084f7ea2e4005a173c1fedeccd6c7
2021-08-30 08:59:47 -07:00
TreeHugger Robot
9983b94ac0 Merge "Add tabs to hide/show data views." 2021-08-27 18:21:17 +00:00
Kelvin Zhang
157e46b183 Stop hardcoding a keypath in OTA generator
Test: th
Change-Id: I6f55a36e4559d635bd6cf24fa0b4891ccd2ab9f8
2021-08-27 10:53:23 -07:00
Anton Hansson
786bf26e3a Add sdk extension version info to prop templates
This adds two new properties alongside AndroidVersion.ApiLevel:
- AndroidVersion.ExtensionLevel: The sdk extension version if the SDK
- AndroidVersion.IsBaseSdk: Whether the extension level is the the one
  that the ApiLevel shipped with (true), or if is an extension SDK
  release (false).

While we're here, dedupe the recipe that processes these templates.

Bug: 195281582
Test: m out/host/linux-x86/development/sdk/platform_source.properties
      and inspect the substitution is working
Change-Id: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
(cherry picked from commit cf2f42c36b7997e9ce87682bb3a5511bdb72936f)
2021-08-27 17:41:03 +01:00
Priyanka
faa9a67afa Add tabs to hide/show data views.
All files with data views are shown by default. Click the chevron in the
top left of the view to expand/collapse the data view.

Bug: b/197626844

Test: upload or run a trace to the x20 staging version linked on the
bug.

Change-Id: I8fdd222e3299670285466fe97f958caa537a1f7e
2021-08-27 15:57:28 +00:00
Nataniel Borges
29728b6386 Merge "Add displays to layers trace" 2021-08-27 11:24:12 +00:00
Nataniel Borges
c0a4c72fa7 Add displays to layers trace
Displays were added to the SF trace. Display the display information on Winscope

Bug: 188792659
Test: check winscope works
Change-Id: Ice1f526c4f370ca5a489063e22206101bdbd48eb
2021-08-27 11:35:42 +02:00
Bo Hu
2e9178c68e Merge "Cube 3d live Wallpaper can't be set on android 11" am: a7fbe75b82 am: 95e1a86c7f am: 3c2d039c54 am: 222f23559e am: ac33f427ab
Original change: https://android-review.googlesource.com/c/platform/development/+/1364437

Change-Id: Ib87075d9d9f01537abf5b765747462fbf0eaf980
2021-08-26 19:43:49 +00:00
Bo Hu
be9f6abf36 Merge "emulator: disable setting NR as network type" am: 2f2313d01c am: b2f5d3e98c am: 5167da569d am: 6cb9946598 am: 3107682ab3
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684870

Change-Id: I09dd80a6ab3340da6ddd477b0d3861e246284fcc
2021-08-26 19:43:33 +00:00
Bo Hu
ac33f427ab Merge "Cube 3d live Wallpaper can't be set on android 11" am: a7fbe75b82 am: 95e1a86c7f am: 3c2d039c54 am: 222f23559e
Original change: https://android-review.googlesource.com/c/platform/development/+/1364437

Change-Id: I869353dc0ced4bdbe826c103b94d455ca281f4c6
2021-08-26 19:28:44 +00:00
Bo Hu
3107682ab3 Merge "emulator: disable setting NR as network type" am: 2f2313d01c am: b2f5d3e98c am: 5167da569d am: 6cb9946598
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684870

Change-Id: I2acaae9b85e09770b7f09cd971f6ee95588f812e
2021-08-26 19:28:37 +00:00
Bo Hu
222f23559e Merge "Cube 3d live Wallpaper can't be set on android 11" am: a7fbe75b82 am: 95e1a86c7f am: 3c2d039c54
Original change: https://android-review.googlesource.com/c/platform/development/+/1364437

Change-Id: I233c345f6f68211b969a73eee8e68ad53baf7253
2021-08-26 19:05:42 +00:00
Bo Hu
6cb9946598 Merge "emulator: disable setting NR as network type" am: 2f2313d01c am: b2f5d3e98c am: 5167da569d
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684870

Change-Id: I838c65fd19a23ae72c4380baafe34d6f20a92fd2
2021-08-26 19:05:37 +00:00
Bo Hu
3c2d039c54 Merge "Cube 3d live Wallpaper can't be set on android 11" am: a7fbe75b82 am: 95e1a86c7f
Original change: https://android-review.googlesource.com/c/platform/development/+/1364437

Change-Id: I4d80b2dfb81831ce1176740b2004f3b63d6e5b0a
2021-08-26 18:50:36 +00:00
Bo Hu
5167da569d Merge "emulator: disable setting NR as network type" am: 2f2313d01c am: b2f5d3e98c
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684870

Change-Id: I0cb86918fd5b5eb31ed633cc7dddcea12c125bd4
2021-08-26 18:50:31 +00:00
Bo Hu
95e1a86c7f Merge "Cube 3d live Wallpaper can't be set on android 11" am: a7fbe75b82
Original change: https://android-review.googlesource.com/c/platform/development/+/1364437

Change-Id: Ie6b4595ffaf9c889f9ce363e08098db15823a2fb
2021-08-26 18:38:42 +00:00
Android Build Prod User
cca0473e0f Merge "Convert DumpViewer to Android.bp" 2021-08-26 17:51:01 +00:00
Bo Hu
a7fbe75b82 Merge "Cube 3d live Wallpaper can't be set on android 11" 2021-08-26 17:33:36 +00: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
2f2313d01c Merge "emulator: disable setting NR as network type" 2021-08-26 16:53:09 +00:00
Android Build Prod User
252664baf7 [automerger skipped] Merge "Refix "emulator: disable setting NR as network type"" into sc-dev-plus-aosp am: a73a8fe2cf am: 1c2114de42 -s ours am: b360ac1b4c -s ours
am skip reason: Merged-In I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c with SHA-1 fe83c41c1d is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15677289

Change-Id: I309c88bf71f9d85a8961da3382a902851e33f829
2021-08-26 00:39:12 +00:00
Android Build Prod User
b360ac1b4c [automerger skipped] Merge "Refix "emulator: disable setting NR as network type"" into sc-dev-plus-aosp am: a73a8fe2cf am: 1c2114de42 -s ours
am skip reason: Merged-In I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c with SHA-1 fe83c41c1d is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15672033

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15677289

Change-Id: If5295b3fda7b0f3968cca0628f1233817af91ced
2021-08-26 00:26:31 +00:00
Android Build Prod User
1c2114de42 Merge "Refix "emulator: disable setting NR as network type"" into sc-dev-plus-aosp am: a73a8fe2cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15677289

Change-Id: I5caaee260b962881d788e3705c2e35e5edf4191a
2021-08-26 00:14:43 +00:00
Bo Hu
f9020aaaf9 Refix "emulator: disable setting NR as network type" am: ba5a679a01 am: 2c536b6eee
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15677291

Change-Id: I97bc0d586f713896e996df05e08b7fe2ec2fffe7
2021-08-25 23:59:19 +00:00
Android Build Prod User
a73a8fe2cf Merge "Refix "emulator: disable setting NR as network type"" into sc-dev-plus-aosp 2021-08-25 23:56:49 +00:00
Bo Hu
2c536b6eee Refix "emulator: disable setting NR as network type" am: ba5a679a01
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15677291

Change-Id: I22dffa20e70e47366099ac3687e4bf79f5e2202a
2021-08-25 23:42:16 +00:00
Android Build Prod User
6568034558 [automerger skipped] Merge "emulator: disable setting NR as network type" into sc-dev-plus-aosp am: 09f16a3e3f am: bbd2415936 -s ours am: 665c63607c -s ours
am skip reason: Merged-In I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c with SHA-1 fe83c41c1d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15672033

Change-Id: I92e7111e28937f009c8c29e9c8f77aef466a868f
2021-08-25 22:52:56 +00:00
Android Build Prod User
665c63607c [automerger skipped] Merge "emulator: disable setting NR as network type" into sc-dev-plus-aosp am: 09f16a3e3f am: bbd2415936 -s ours
am skip reason: Merged-In I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c with SHA-1 fe83c41c1d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15672033

Change-Id: Ib82f6fa044be6ea79a63bb110ab6a6ec0364967b
2021-08-25 22:34:47 +00:00
Bo Hu
573495bdeb 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:47 +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
Android Build Prod User
bbd2415936 Merge "emulator: disable setting NR as network type" into sc-dev-plus-aosp am: 09f16a3e3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15672033

Change-Id: If4a6e5ac5db66d0811ac5895bd793f340c7a6001
2021-08-25 22:20:23 +00:00
Android Build Prod User
09f16a3e3f Merge "emulator: disable setting NR as network type" into sc-dev-plus-aosp 2021-08-25 22:08:46 +00:00
Aurimas Liutikas
57eeb31650 Convert DumpViewer to Android.bp
Test: make DumpViewer
Change-Id: I0f2fe63a3742888978cebd5bb9947d37291c5545
2021-08-25 16:17:11 +00:00
Pablo Gamito
b38a01fb29 Merge "Add option to press enter to search for timestamp" 2021-08-25 09:09:53 +00:00