Commit Graph

30933 Commits

Author SHA1 Message Date
Nataniel Borges
080c06eb6d Merge "5/ Show Flicker properties on Winscope (WM)" into sc-dev am: 1d6a084cc9 am: bf1fb20066
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14294778

Change-Id: I8d8e07d47fe71235e9bdedbe096901a6cd1f2247
2021-05-19 22:17:58 +00:00
TreeHugger Robot
7c97455eb4 Merge "Adding singleInstancePerTask type activity in IntentPlayground" into sc-dev am: 77261d6571 am: ac17b3265b
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14420656

Change-Id: I047657546be9a8c945fd73472e08deefc2655d00
2021-05-19 21:27:44 +00:00
Pirama Arumuga Nainar
6f5f5ccc06 Merge "Send coverage flush signal to only processes that handle signal 37." am: 4851047a4c am: 67447582a3 am: 75f50e8b02 am: fe0d4acb38 am: 6851708952
Original change: https://android-review.googlesource.com/c/platform/development/+/1691921

Change-Id: Ie0cfa1ce7cefad30543a00de1cf8fec3b0164360
2021-05-19 21:12:29 +00:00
Nikita Dubrovsky
6d2338d6e0 Merge "Update demo app for content insertion to save & display images" into sc-dev am: 7bbcbefdda am: 0a5f123590
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14390778

Change-Id: If5cbc1e909144525f5940af1e102eca5c44e4af0
2021-05-19 19:49:49 +00:00
Yuntao Xu
5cb7f93b14 Merge "Revert "Convert Development/Android.mk to Android.bp"" am: 056344fcf6 am: 8d9b8f017a am: fd54ed89ab am: c7930a90a8 am: 22c0aff1a8
Original change: https://android-review.googlesource.com/c/platform/development/+/1691914

Change-Id: If23829599ea322a0403a530e6cd546bc41d9cd99
2021-05-19 17:05:08 +00:00
Yuntao Xu
387ec8d2cb Merge "Convert Development/Android.mk to Android.bp" am: d0e60e25c2 am: 14b78ea954 am: 9e20f8da4a am: 3a947d831d am: 195fd2024a
Original change: https://android-review.googlesource.com/c/platform/development/+/1688703

Change-Id: I942f0bdffc3db29bcb331d49cab086c95dd9500c
2021-05-19 16:00:38 +00:00
Yuntao Xu
f8c4372f1f Merge "Convert monkey/Android.mk to Android.bp" am: e79f478e3c am: 23769afd33 am: c52930e6a0 am: c15925d160 am: 55765a9913
Original change: https://android-review.googlesource.com/c/platform/development/+/1690286

Change-Id: I9f7f152dfd7f3480c5a593b8bf1d51311b31df27
2021-05-19 15:50:33 +00:00
Yuntao Xu
2784d4c080 Merge "Convert MultiDisplay/Android.mk to Android.bp" am: 9e504cc4c5 am: 45950f4fc4 am: 7dfe30b1ae am: 59dd88d490 am: 42d31c858b
Original change: https://android-review.googlesource.com/c/platform/development/+/1689115

Change-Id: I0d31f3ca23ba2607507181a21283a7325434a296
2021-05-19 15:33:27 +00:00
Yuntao Xu
ef78946146 Merge "Convert Android.mk to Android.bp" am: 64b8511941 am: 880a6ba188 am: 859f63e840 am: 6d94d1116b am: 1c0559f935
Original change: https://android-review.googlesource.com/c/platform/development/+/1689112

Change-Id: I73008f209fe6b795dd40401ac6f3d2b332f2df3e
2021-05-19 12:25:32 +00:00
Yuntao Xu
78c093376e Merge "Convert IntentPlayground/Android.mk to Android.bp" am: e281d79cff am: c84d747f03 am: bc9b86f776 am: 8ce6b456d6 am: 3e39f169f7
Original change: https://android-review.googlesource.com/c/platform/development/+/1691912

Change-Id: I1856a257f8c28b59591b2eec06463e3cafe4afca
2021-05-19 12:05:25 +00:00
Yuntao Xu
13a191d3df Merge "Convert ShortcutSample/Android.mk to Android.bp" am: 16d4d75ae6 am: 4472cf6306 am: 825c1c2b43 am: b0c776c35d am: b681ebf3ad
Original change: https://android-review.googlesource.com/c/platform/development/+/1691910

Change-Id: I9ef38f8211b86a89186c44d2ff4fce4ed82b952e
2021-05-19 11:12:31 +00:00
Joel Galenson
2e68e202a9 Merge "Do not write out the --no-test-mapping option." am: cedb102822 am: 3b014257fa am: 6e4fbaaebc am: c7a545aabc am: 093ef9e0f3
Original change: https://android-review.googlesource.com/c/platform/development/+/1691526

Change-Id: I2dc8d79c5040e1d317424be2fc09d28007e30c9e
2021-05-19 10:05:57 +00:00
Nataniel Borges
ada3dc0bca 4/ Sort property values on Winscope am: 449ee7d803 am: cf31029de7
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14294769

Change-Id: I801f1fc8c5a43a2f02a62d71db9056c469ec0abf
2021-05-19 08:59:09 +00:00
Nataniel Borges
a0320a5e4d 3/ Simplify WM parsing on Winscope am: 06a596be4d am: 29f0b9a3f1 am: 09cc60c90d
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14294766

Change-Id: I130d6b6e92b56574c9a25d1f0e0adfc5a882998e
2021-05-18 23:56:04 +00:00
David Srbecky
e51207c8e0 Merge "Make the stack script python3.5 compatible." am: ec44e57e10 am: 89b2239085 am: bdaf67cf23 am: b3dd38e0b7 am: 025158ba48 am: 187403ad96
Original change: https://android-review.googlesource.com/c/platform/development/+/1689066

Change-Id: Ic9ef41234b38ac430f89f45cd43576e41f41074c
2021-05-18 23:55:57 +00:00
Yo Chiang
514206c17d Merge "repo-review: Add a 'restore' command line option" am: 6a454c160e am: 2d4c1f67b8 am: 0ced6ab6d6 am: 83c1420457 am: 9af8cd733d am: 4ea291bf35
Original change: https://android-review.googlesource.com/c/platform/development/+/1686051

Change-Id: Ib0392a826f47ccc6d71faaa18efa51ebd2fc077a
2021-05-18 23:55:50 +00:00
Roland Levillain
10118c616e Merge "Fix adb root invocations in script acov-llvm.py." am: 97988980d0 am: a0c4af18c3 am: f6fc60c2be am: a9018531f6 am: b24d4656a7 am: fb2685930f
Original change: https://android-review.googlesource.com/c/platform/development/+/1706846

Change-Id: I6e4fa26fecb5eec55f8978b06336145a17576fac
2021-05-18 23:55:42 +00:00
Treehugger Robot
8e450940b4 Merge "Add support for vndk llndk libraries in Android.bp" am: f205499be8 am: 9b98a3668c am: 7f9d3ffd32 am: c8401b6819 am: f530a8679e am: e256c6e729
Original change: https://android-review.googlesource.com/c/platform/development/+/1706410

Change-Id: Iffdb193ef0a2abdd00766e08c82eb1108833e733
2021-05-18 23:55:35 +00:00
Hongwei Wang
7b5ac739ae Fix flicker in ApiDemos when auto enter PiP from landscape am: d1cc26450c am: d36c2c292e am: 1d2d8e8fa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14444974

Change-Id: I748fb7487f4423fdd31fed001c540b508d7a349b
2021-05-18 23:55:27 +00:00
Treehugger Robot
7649820aae [automerger skipped] Merge "Add <uses-library> information." am: 37f061b11a am: 4cece5365b am: f75d86ae54 -s ours am: a7556ccb2a -s ours am: 24fc1173cf -s ours am: 19aae869e5 -s ours
am skip reason: Merged-In Ie5e36dd60040a1e7653acdf882e006de513f5367 with SHA-1 247d38afd5 is already in history

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

Change-Id: Ib8a79a56c4eaafb8196dacd79c09ac97abbf9792
2021-05-18 23:55:21 +00:00
Treehugger Robot
899b335afa Merge "monkey: Use java_binary" am: 4b4bf9f755 am: 914371f674 am: bd944df7b4 am: 876a1b7826 am: 8a56f650b8 am: a28a527604
Original change: https://android-review.googlesource.com/c/platform/development/+/1699169

Change-Id: Iaa0ce5d863c3429ac757cfefe9c8245b44442601
2021-05-17 18:20:32 +00:00
Xin Li
836aa495eb [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: d63133de19 -s ours am: a5a45097ac -s ours am: cd8b551fa3 -s ours am: 6b0eccddcc -s ours am: 61163fe1fd -s ours am: 8ed1ad5c63 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8382a3fef37ddd15e6833de37e42676c0a98780d
2021-05-17 07:03:23 +00:00
Ulya Trafimovich
9bda84917d Add <uses-library> information. am: 247d38afd5 am: ce1816f30a am: 29a29d3ca7
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14468789

Change-Id: Ifeb332d7785793a9d2e1cd7346cca2c5c9d07a9a
2021-05-17 04:03:10 +00:00
Nataniel Borges
a2feeca223 Merge "5/ Show Flicker properties on Winscope (WM)" into sc-dev am: 1d6a084cc9 am: 524b9d52ea am: 6b3ad8e48e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14294778

Change-Id: I86e10f66045d517899d014e290ad64c263074661
2021-05-17 04:03:01 +00:00
TreeHugger Robot
5a1326feb7 Merge "Adding singleInstancePerTask type activity in IntentPlayground" into sc-dev am: 77261d6571 am: f585fc2e34 am: cd07adff02
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14420656

Change-Id: I92307055916da692cc7088d7e70bc10a4985a48c
2021-05-17 04:02:53 +00:00
Pirama Arumuga Nainar
51b0e21536 Merge "Send coverage flush signal to only processes that handle signal 37." am: 4851047a4c am: 67447582a3 am: 75f50e8b02 am: fe0d4acb38 am: 86715a9868 am: ff2718e79f
Original change: https://android-review.googlesource.com/c/platform/development/+/1691921

Change-Id: I5ea52d449117bc643d92820c73338fbb303f7f33
2021-05-17 04:02:47 +00:00
Nikita Dubrovsky
b460bd55d0 Merge "Update demo app for content insertion to save & display images" into sc-dev am: 7bbcbefdda am: cc7de18e85 am: 9d89c8925d
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14390778

Change-Id: I975407f927fb83a53617315d3bf98c2b62a24111
2021-05-17 04:02:39 +00:00
Yuntao Xu
1e5fdb1376 Merge "Revert "Convert Development/Android.mk to Android.bp"" am: 056344fcf6 am: 8d9b8f017a am: fd54ed89ab am: c7930a90a8 am: 4b4fc1e860 am: 2598870e68
Original change: https://android-review.googlesource.com/c/platform/development/+/1691914

Change-Id: I80e7e396add31d507f28fa45bfa489ea22c36506
2021-05-17 04:02:33 +00:00
Yuntao Xu
c432783a19 Merge "Convert Development/Android.mk to Android.bp" am: d0e60e25c2 am: 14b78ea954 am: 9e20f8da4a am: 3a947d831d am: ba7509b165 am: 61abc0fb44
Original change: https://android-review.googlesource.com/c/platform/development/+/1688703

Change-Id: I47ca3f686aae28081d46d053cc28827be30726ff
2021-05-17 04:02:26 +00:00
Yuntao Xu
5d2e170b85 Merge "Convert monkey/Android.mk to Android.bp" am: e79f478e3c am: 23769afd33 am: c52930e6a0 am: c15925d160 am: 1e8c7fb69a am: 720ced2af0
Original change: https://android-review.googlesource.com/c/platform/development/+/1690286

Change-Id: I999049aca8118c6101503cb5691c2893ab7f7490
2021-05-17 04:02:18 +00:00
Yuntao Xu
ce3c3d0a50 Merge "Convert MultiDisplay/Android.mk to Android.bp" am: 9e504cc4c5 am: 45950f4fc4 am: 7dfe30b1ae am: 59dd88d490 am: 0c89f18263 am: 76da0428c3
Original change: https://android-review.googlesource.com/c/platform/development/+/1689115

Change-Id: I3fe385e4fc285df2d0dc93e0d1b5015db04d8b02
2021-05-17 04:02:10 +00:00
Yuntao Xu
3e8b2b5e2c Merge "Convert Android.mk to Android.bp" am: 64b8511941 am: 880a6ba188 am: 859f63e840 am: 6d94d1116b am: 2b058fa205 am: 70eba242ee
Original change: https://android-review.googlesource.com/c/platform/development/+/1689112

Change-Id: I978f87ffb97126c765805a9727bacedf0a8ff1b3
2021-05-17 04:02:03 +00:00
Yuntao Xu
2e35f5e302 Merge "Convert IntentPlayground/Android.mk to Android.bp" am: e281d79cff am: c84d747f03 am: bc9b86f776 am: 8ce6b456d6 am: 7d9820b407 am: 14d8b5fb54
Original change: https://android-review.googlesource.com/c/platform/development/+/1691912

Change-Id: I6ce547cd4694241807ba2404a42cc7766d1eba4c
2021-05-17 04:01:55 +00:00
Yuntao Xu
2080bb9c1d Merge "Convert ShortcutSample/Android.mk to Android.bp" am: 16d4d75ae6 am: 4472cf6306 am: 825c1c2b43 am: b0c776c35d am: c33a10745e am: 1e2e30a2ed
Original change: https://android-review.googlesource.com/c/platform/development/+/1691910

Change-Id: I90ce346e33d87b3bb503866027dfd1f62595d69b
2021-05-17 04:01:47 +00:00
Joel Galenson
2eb4884261 Merge "Do not write out the --no-test-mapping option." am: cedb102822 am: 3b014257fa am: 6e4fbaaebc am: c7a545aabc am: 7a869bc6ac am: 71270e1986
Original change: https://android-review.googlesource.com/c/platform/development/+/1691526

Change-Id: I6ee0c52184384bf95443c29e16917ad8848bc0d2
2021-05-17 04:01:40 +00:00
Nataniel Borges
0d28e326fa 4/ Sort property values on Winscope am: 449ee7d803 am: d436be4be4 am: 716b41915f
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14294769

Change-Id: Ibe1b2758e9fd4035152945144147deadb1adbb02
2021-05-17 04:01:31 +00:00
Nataniel Borges
1680a5b20c 3/ Simplify WM parsing on Winscope am: 06a596be4d am: 85de977b6e am: 5d1f41d726
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14294766

Change-Id: I348708f6409d3d6d2596add8fa16018af1b8020d
2021-05-16 05:34:04 +00:00
David Srbecky
f6175353be Merge "Make the stack script python3.5 compatible." am: ec44e57e10 am: 89b2239085 am: bdaf67cf23 am: b3dd38e0b7 am: 1817e81bdf am: f330ea6b1b
Original change: https://android-review.googlesource.com/c/platform/development/+/1689066

Change-Id: Ic862f08779c695fed61a4b0f6d5f271958d09976
2021-05-16 05:33:57 +00:00
Yo Chiang
ec3722b6f0 Merge "repo-review: Add a 'restore' command line option" am: 6a454c160e am: 2d4c1f67b8 am: 0ced6ab6d6 am: 83c1420457 am: 78ffb434af am: fb84146eab
Original change: https://android-review.googlesource.com/c/platform/development/+/1686051

Change-Id: I08b351c174f1317556ba72697dde6ccbf38b60f9
2021-05-16 05:33:50 +00:00
Treehugger Robot
af20505c38 Merge changes from topic "c2a-apex" am: 2d7bce0b3b am: f9acf16725 am: 350c24d8ed am: a4b59376c4 am: a9a03498ec
Original change: https://android-review.googlesource.com/c/platform/development/+/1686814

Change-Id: I2a001b89bd38a28d28f22e908c3bd0182c19da69
2021-05-16 05:33:42 +00:00
Joel Galenson
b5e1ab1835 Allow cargo2android.py to use a config file instead of command-line options. am: 0fbdafe016 am: 6c63da7a86 am: c5c74033f2 am: a5d0ad336c am: ac840f228d
Original change: https://android-review.googlesource.com/c/platform/development/+/1686813

Change-Id: I31c1bd26b66f77aaa07ef4aeaf615f88450e2c9b
2021-05-16 05:33:36 +00:00
Ming-Shin Lu
03c0746113 Merge "Remove onToggleSoftInput" into sc-dev am: 2ccdb18d20 am: 705b362308
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14303055

Change-Id: Ieab14b3892c85c37f5758ca4445cebe58034380a
2021-05-16 05:33:30 +00:00
TreeHugger Robot
5d3768ac2e Merge "Sdksetup: Set path for display settings file for freeform display" into sc-dev am: 9b4e646bda am: 70a3c8dc01
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14252089

Change-Id: I64e1fce0d8ed7a3fcbe86e05ec273bf76201387f
2021-05-16 05:33:25 +00:00
Treehugger Robot
2aa06efd8f Merge "[SdkSetup] Add open network "AndroidWifi"" am: d69af024bc am: eb2f1dceae am: 88455c3cfa am: c92b60c117 am: 0165ee4ce3
Original change: https://android-review.googlesource.com/c/platform/development/+/1679686

Change-Id: I87600d5a2917574afd20d5962f351f4debebc55f
2021-05-16 05:33:20 +00:00
Bob Badour
40c15d7489 [LSC] Add LOCAL_LICENSE_KINDS to development am: 4d6df6aead am: 710f722e68
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14284325

Change-Id: I31fe0bca76500045f15ca5208803b91dd720ca07
2021-05-16 05:33:13 +00:00
Treehugger Robot
93b7268b7f Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: e748063d28 am: 347249060a am: dafb7fc537 am: 3291dd14f1 am: 7988a0c9ce
Original change: https://android-review.googlesource.com/c/platform/development/+/1682225

Change-Id: I2f5a5efd047bd86e34c4b6fc0ef91832b85ad7d6
2021-05-16 05:33:09 +00:00
Søren Gjesse
0879f8f358 Merge "Remove DX from the SDK" am: a5b6f93ff2 am: a2c173be97 am: 0b05fe7f8f am: a901356832 am: 90480af354
Original change: https://android-review.googlesource.com/c/platform/development/+/1681270

Change-Id: I7a5ddd03ec3f348e6eb5c9c259f3ccddaa608c9e
2021-05-16 05:33:02 +00:00
Neha Jain
a5b1eb6642 Update release config and emulator files for Android S(API 31) Beta2 am: 10cbdd49a3 am: f9a4579c3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14246245

Change-Id: I304f6c79fe4d224617151bd246d0dbbc2d90324d
2021-05-16 05:32:56 +00:00
Neha Jain
23161719cf Update release config and emulator files for Android S(API 31) Beta1 am: 9d57a6cea6 am: a706e52898
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14238581

Change-Id: I19967ffbac826f8354320989e6b84243c4c0efb1
2021-05-16 05:32:51 +00:00
Søren Gjesse
8d65c483ce Merge "Revert "Remove DX from the SDK"" am: 4e005d8a1c am: 783a0df53e am: 08412579dd am: a560627ab3 am: 0ffb39abfa
Original change: https://android-review.googlesource.com/c/platform/development/+/1679488

Change-Id: I284d382f7668b645e33bf17ef99e2ba081be760a
2021-05-16 05:32:46 +00:00