Commit graph

9379 commits

Author SHA1 Message Date
Josh Gao
a8f07b3f00 Merge "Track rename of adbd_system_binaries." am: a9fff2f021 am: bd8f33763f am: 028fd7a25f am: 3261cbcf9b am: 4b00707dc9 am: 67a2e6bd5b
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1322003

Change-Id: I036caf4bb023ffcfe3a31696f0f3a6e21ac971b2
2020-06-08 22:33:38 +00:00
Josh Gao
67a2e6bd5b Merge "Track rename of adbd_system_binaries." am: a9fff2f021 am: bd8f33763f am: 028fd7a25f am: 3261cbcf9b am: 4b00707dc9
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1322003

Change-Id: Icf51cc9120bbb4f63e830e23f2d1c1ba2c42c7a1
2020-06-08 22:21:01 +00:00
Josh Gao
4b00707dc9 Merge "Track rename of adbd_system_binaries." am: a9fff2f021 am: bd8f33763f am: 028fd7a25f am: 3261cbcf9b
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1322003

Change-Id: I2d563e13505a47b209e742709ead2fdbeeb8fc96
2020-06-08 22:05:43 +00:00
Josh Gao
3261cbcf9b Merge "Track rename of adbd_system_binaries." am: a9fff2f021 am: bd8f33763f am: 028fd7a25f
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1322003

Change-Id: Ia139c9d3aaec95c3b1c89f5844a4dab6ab51186c
2020-06-08 21:52:12 +00:00
Josh Gao
028fd7a25f Merge "Track rename of adbd_system_binaries." am: a9fff2f021 am: bd8f33763f
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1322003

Change-Id: I7478dcf638dabf81ef4f31753d61274d35cc0764
2020-06-08 21:31:27 +00:00
Josh Gao
bd8f33763f Merge "Track rename of adbd_system_binaries." am: a9fff2f021
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1322003

Change-Id: Icd0ed4a93ac687f8e6c12a036cfc4a5d6eeeeebb
2020-06-08 21:16:39 +00:00
Josh Gao
4473e1689f Track rename of adbd_system_binaries.
Bug: http://b/157709367
Test: treehugger
Change-Id: Ic205acc56a763c38ba689b2b895609b5e878d813
(cherry picked from commit d4a964f121)
2020-06-08 14:09:08 -07:00
Josh Gao
a9fff2f021 Merge "Track rename of adbd_system_binaries." 2020-06-08 21:00:18 +00:00
Xin Li
af169a76fd [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 3e72aaf11c -s ours am: 90a22f36f9 -s ours am: 774e6307df -s ours am: 93b2650a81 -s ours am: d5c4436723 -s ours am: 4ad2d19e37 -s ours
am skip reason: Change-Id Ia91690b4826ce358a08766ebe6e756cb1fec0ba1 with SHA-1 fb9d4fc54b is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1323300

Change-Id: I1db5df1687e6dad4e91633b0cc7a37ae018f3ee8
2020-06-08 17:39:45 +00:00
Xin Li
4ad2d19e37 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 3e72aaf11c -s ours am: 90a22f36f9 -s ours am: 774e6307df -s ours am: 93b2650a81 -s ours am: d5c4436723 -s ours
am skip reason: Change-Id Ia91690b4826ce358a08766ebe6e756cb1fec0ba1 with SHA-1 fb9d4fc54b is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1323300

Change-Id: I22d9227d511e45e6e51997e1ba8e0cb186b06c6b
2020-06-08 17:25:05 +00:00
Xin Li
d5c4436723 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 3e72aaf11c -s ours am: 90a22f36f9 -s ours am: 774e6307df -s ours am: 93b2650a81 -s ours
am skip reason: Change-Id Ia91690b4826ce358a08766ebe6e756cb1fec0ba1 with SHA-1 fb9d4fc54b is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1323300

Change-Id: Ib80a1209ee999d620a57a3943619a6ba7dc92592
2020-06-08 16:42:01 +00:00
Xin Li
93b2650a81 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 3e72aaf11c -s ours am: 90a22f36f9 -s ours am: 774e6307df -s ours
am skip reason: Change-Id Ia91690b4826ce358a08766ebe6e756cb1fec0ba1 with SHA-1 fb9d4fc54b is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1323300

Change-Id: Iaad713ffb22bea494bee48895ee0984e05f4fc4d
2020-06-08 16:29:18 +00:00
Xin Li
774e6307df [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 3e72aaf11c -s ours am: 90a22f36f9 -s ours
am skip reason: Change-Id Ia91690b4826ce358a08766ebe6e756cb1fec0ba1 with SHA-1 fb9d4fc54b is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1323300

Change-Id: I788225ab50338d17b34bf615b117ef9c2429ad64
2020-06-08 16:07:59 +00:00
Xin Li
90a22f36f9 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 3e72aaf11c -s ours
am skip reason: Change-Id Ia91690b4826ce358a08766ebe6e756cb1fec0ba1 with SHA-1 fb9d4fc54b is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1323300

Change-Id: Id0541da5f14ad32b40bfb85389fc3f3268135fb6
2020-06-08 15:56:44 +00:00
Xin Li
3e72aaf11c Merge "Merge QQ3A.200605.002 into master" 2020-06-06 01:41:22 +00:00
Xin Li
674edaf2ed Merge QQ3A.200605.002 into master
Bug: 158095402
Merged-In: Ia91690b4826ce358a08766ebe6e756cb1fec0ba1
Change-Id: Ic755f590685f40ee90c08c7c8be3a62e56b98cd5
2020-06-03 10:44:41 -07:00
Josh Gao
d4a964f121 Track rename of adbd_system_binaries.
Bug: http://b/157709367
Test: treehugger
Change-Id: Ic205acc56a763c38ba689b2b895609b5e878d813
2020-06-01 18:58:57 -07:00
Jiyong Park
ddf9d4c066 Merge "Use ro.build.fingerprint instead of ro.bootimage.*" am: d081fbceba am: fb9d4fc54b am: 941bf55f9d am: bfa93a9472 am: 792755f0c7 am: 5709fd73e3
Change-Id: I4d7ec2a6284a10f33697c2567f16916c3858b721
2020-05-29 22:38:57 +00:00
Jiyong Park
5709fd73e3 Merge "Use ro.build.fingerprint instead of ro.bootimage.*" am: d081fbceba am: fb9d4fc54b am: 941bf55f9d am: bfa93a9472 am: 792755f0c7
Change-Id: I6fc2f302a3d4c7501ff57c1dfa7a0de0e818cfdc
2020-05-29 22:25:52 +00:00
Jiyong Park
792755f0c7 Merge "Use ro.build.fingerprint instead of ro.bootimage.*" am: d081fbceba am: fb9d4fc54b am: 941bf55f9d am: bfa93a9472
Change-Id: I79dce6f20d4bd7a8725ff17ac8b36132a02285f8
2020-05-29 22:14:42 +00:00
Jiyong Park
bfa93a9472 Merge "Use ro.build.fingerprint instead of ro.bootimage.*" am: d081fbceba am: fb9d4fc54b am: 941bf55f9d
Change-Id: Id21167f5d7fd952b788344580ddcc676fce3d133
2020-05-29 21:54:26 +00:00
Jiyong Park
941bf55f9d Merge "Use ro.build.fingerprint instead of ro.bootimage.*" am: d081fbceba am: fb9d4fc54b
Change-Id: Idb4ae52052578e578d0844b479a4d0ede190337e
2020-05-29 21:52:11 +00:00
Jiyong Park
fb9d4fc54b Merge "Use ro.build.fingerprint instead of ro.bootimage.*" am: d081fbceba
Change-Id: Ia91690b4826ce358a08766ebe6e756cb1fec0ba1
2020-05-29 21:43:04 +00:00
Jiyong Park
d081fbceba Merge "Use ro.build.fingerprint instead of ro.bootimage.*" 2020-05-29 01:01:52 +00:00
Jiyong Park
bfd6764bf6 Use ro.build.fingerprint instead of ro.bootimage.*
ro.bootimage.* sysprops will be removed as they are redundant. Read
ro.build.fingerprint instead.

This is safe because:
2) ro.bootimage.build.fingerprint is the same as other
ro.<partition>.build.fingerprint all of which are from
$(BUILD_FINGERPRINT_FILE).
3) BUILD_FINGERPRINT_FILE is composed of PRODUCT_BRAND, TARGET_PRODUCT,
TARGET_DEVICE, etc.
4) ro.build.fingerprint is auto-composed by init at runtime by the same
rule as #3.

Bug: 117892318
Test: enter into the recovery mode and manually inspect the title line
Change-Id: If28d710f45b98a0effc0159851bca6afb2aa5735
2020-05-25 18:14:53 +09:00
android-build-team Robot
f5fef1e8df Snap for 6517089 from aba17e1c9a to mainline-release
Change-Id: I5bfab6ee81428d966a8119937a35aaecc617e079
2020-05-21 07:13:58 +00:00
Automerger Merge Worker
6431e0ab69 Merge "[automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 am: b3cd9fad22 am: 3eac3fed78 -s ours" into rvc-qpr-dev-plus-aosp am: 197342a0ac -s ours am: 5d63e7e3ed -s ours
am skip reason: Change-Id I73fe44be3790bdba5a6059fbba3f7264b21eed99 with SHA-1 4d0df88d88 is in history

Change-Id: I5ec5b6f9e18f465eeff8faf16697d051d4d17494
2020-05-20 17:50:21 +00:00
Hongguang Chen
485545217e [automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 -s ours am: f3f4f9f021 -s ours am: b6d0b82aa6 -s ours am: 336d7a9d4e -s ours am: ed45f0b075 -s ours
am skip reason: Change-Id I73fe44be3790bdba5a6059fbba3f7264b21eed99 with SHA-1 4d0df88d88 is in history

Change-Id: I8da21674e98bcdf653104b480d6e8868e3ff5e95
2020-05-20 17:50:06 +00:00
Hongguang Chen
8f89b284f5 [automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 am: b3cd9fad22 -s ours am: 2de11c0389 -s ours am: b0f0e6900f -s ours am: 505a845b0b -s ours
am skip reason: Change-Id I73fe44be3790bdba5a6059fbba3f7264b21eed99 with SHA-1 042672729c is in history

Change-Id: Ia6e9bcbe35d1bdfb2d4a18b124e4f166d60f75b2
2020-05-20 17:49:23 +00:00
Automerger Merge Worker
5d63e7e3ed Merge "[automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 am: b3cd9fad22 am: 3eac3fed78 -s ours" into rvc-qpr-dev-plus-aosp am: 197342a0ac -s ours
am skip reason: Change-Id I73fe44be3790bdba5a6059fbba3f7264b21eed99 with SHA-1 4d0df88d88 is in history

Change-Id: Ib5d6159f7fe938c4600d9834e49b04c24b0772fd
2020-05-20 17:38:55 +00:00
Hongguang Chen
ed45f0b075 [automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 -s ours am: f3f4f9f021 -s ours am: b6d0b82aa6 -s ours am: 336d7a9d4e -s ours
am skip reason: Change-Id I73fe44be3790bdba5a6059fbba3f7264b21eed99 with SHA-1 4d0df88d88 is in history

Change-Id: Ia5896f00511425311b87d3afb71d1ba9b738e592
2020-05-20 17:38:29 +00:00
Hongguang Chen
505a845b0b [automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 am: b3cd9fad22 -s ours am: 2de11c0389 -s ours am: b0f0e6900f -s ours
am skip reason: Change-Id I73fe44be3790bdba5a6059fbba3f7264b21eed99 with SHA-1 042672729c is in history

Change-Id: Ifce5ab40733634937fa33e35a9e2a75681079b51
2020-05-20 17:38:13 +00:00
Automerger Merge Worker
197342a0ac Merge "[automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 am: b3cd9fad22 am: 3eac3fed78 -s ours" into rvc-qpr-dev-plus-aosp 2020-05-20 17:12:51 +00:00
Hongguang Chen
336d7a9d4e [automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 -s ours am: f3f4f9f021 -s ours am: b6d0b82aa6 -s ours
am skip reason: Change-Id I73fe44be3790bdba5a6059fbba3f7264b21eed99 with SHA-1 4d0df88d88 is in history

Change-Id: I3466f1b2b8fd6b942d91c02e239bd3585e284d8b
2020-05-20 17:12:44 +00:00
Hongguang Chen
be27b3df0f [automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 am: b3cd9fad22 am: 3eac3fed78 -s ours
am skip reason: Change-Id I73fe44be3790bdba5a6059fbba3f7264b21eed99 with SHA-1 4d0df88d88 is in history

Change-Id: I02fb69d0e1cd2432c01c3fc59ed44f85404291c2
2020-05-20 17:12:43 +00:00
Hongguang Chen
b0f0e6900f [automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 am: b3cd9fad22 -s ours am: 2de11c0389 -s ours
am skip reason: Change-Id I73fe44be3790bdba5a6059fbba3f7264b21eed99 with SHA-1 042672729c is in history

Change-Id: I1e9b3840616e82edf4dfe3f4dc664fc034004caa
2020-05-20 17:12:32 +00:00
Hongguang Chen
3eac3fed78 Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 am: b3cd9fad22
Change-Id: Iadaf364243182dbe95336b58c755da3751fc1628
2020-05-20 17:00:24 +00:00
Hongguang Chen
b6d0b82aa6 [automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 -s ours am: f3f4f9f021 -s ours
am skip reason: Change-Id I73fe44be3790bdba5a6059fbba3f7264b21eed99 with SHA-1 4d0df88d88 is in history

Change-Id: Id9ba3c82c58b5a6b3aba2501bfd47163e3b91cf8
2020-05-20 17:00:00 +00:00
Hongguang Chen
2de11c0389 [automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 am: b3cd9fad22 -s ours
am skip reason: Change-Id I73fe44be3790bdba5a6059fbba3f7264b21eed99 with SHA-1 042672729c is in history

Change-Id: I6559a50c1d89fbdfd9e5b415b78f8051fbc5cf9e
2020-05-20 16:59:50 +00:00
Hongguang Chen
aba17e1c9a Add EthernetDevice to manage ethernet connection. am: 4d0df88d88
Change-Id: Id0cb52d0022a9086c3287dcf6096d6e9dbf3503a
2020-05-20 16:43:29 +00:00
Hongguang Chen
b3cd9fad22 Add EthernetDevice to manage ethernet connection. am: 4d0df88d88
Change-Id: Ic49ffc0224223c3d6f0d9c65333097ac3e3c1760
2020-05-20 16:43:10 +00:00
Hongguang Chen
f3f4f9f021 [automerger skipped] Add EthernetDevice to manage ethernet connection. am: 4d0df88d88 -s ours
am skip reason: Change-Id I73fe44be3790bdba5a6059fbba3f7264b21eed99 with SHA-1 042672729c is in history

Change-Id: I806e1f57f9d94643166558624546ea2cab6ad752
2020-05-20 16:42:35 +00:00
Treehugger Robot
e4d008fd6c [automerger skipped] Merge changes from topic "nonab_pkg" am: 31deac96f4 am: fa6c4eaf3e -s ours am: c1b87ecdc0 -s ours am: caab315bdb -s ours am: fafcc6518a -s ours am: 10ae079351 -s ours
am skip reason: Change-Id I28a4047b5f2051acc039084f65a71deb492d9dcb with SHA-1 dff8004275 is in history

Change-Id: I0e04068b5366af7ee44617aaf2acaabc2f6c314a
2020-05-20 02:21:13 +00:00
Yifan Hong
6f0f773098 [automerger skipped] Add slot suffix to DAP ops am: 35d5e9f4cf am: 9f8b386056 -s ours am: bd312b8c65 -s ours am: 836342a972 -s ours am: 18b10d911c -s ours am: d80a5bbbe2 -s ours
am skip reason: Change-Id Idbd0bfea142529a33dddb4d2debfc74513290730 with SHA-1 bc7e1db211 is in history

Change-Id: Id44023a078c55776a8e9bebe9461d00443c7d76e
2020-05-20 02:21:11 +00:00
Yifan Hong
a792866b03 [automerger skipped] Detect non-A/B vs. A/B packages correctly. am: f2af5629d2 am: d5c56cee29 -s ours am: 3e5cc2207c -s ours am: 59c7a40229 -s ours am: 041a5f535f -s ours am: 20d2ff2fc5 -s ours
am skip reason: Change-Id I629a533a67966d46d9cd87a59c6b9af26daf1667 with SHA-1 2a4afd29a1 is in history

Change-Id: I4e55b3e684c0b296ee5c06b90a18f5b412d1969e
2020-05-20 02:21:10 +00:00
Treehugger Robot
10ae079351 [automerger skipped] Merge changes from topic "nonab_pkg" am: 31deac96f4 am: fa6c4eaf3e -s ours am: c1b87ecdc0 -s ours am: caab315bdb -s ours am: fafcc6518a -s ours
am skip reason: Change-Id I28a4047b5f2051acc039084f65a71deb492d9dcb with SHA-1 dff8004275 is in history

Change-Id: I0e4d968269460a85e4c46a69388b1678248a6c63
2020-05-20 02:08:00 +00:00
Yifan Hong
d80a5bbbe2 [automerger skipped] Add slot suffix to DAP ops am: 35d5e9f4cf am: 9f8b386056 -s ours am: bd312b8c65 -s ours am: 836342a972 -s ours am: 18b10d911c -s ours
am skip reason: Change-Id Idbd0bfea142529a33dddb4d2debfc74513290730 with SHA-1 bc7e1db211 is in history

Change-Id: I64e99e53222f01e84dd0e7ee0cd263ef9c96dc14
2020-05-20 02:07:57 +00:00
Yifan Hong
20d2ff2fc5 [automerger skipped] Detect non-A/B vs. A/B packages correctly. am: f2af5629d2 am: d5c56cee29 -s ours am: 3e5cc2207c -s ours am: 59c7a40229 -s ours am: 041a5f535f -s ours
am skip reason: Change-Id I629a533a67966d46d9cd87a59c6b9af26daf1667 with SHA-1 2a4afd29a1 is in history

Change-Id: I6982a5a2a9d1f9f7ed96cbc274b83b8369b76de6
2020-05-20 02:07:56 +00:00
Treehugger Robot
fafcc6518a [automerger skipped] Merge changes from topic "nonab_pkg" am: 31deac96f4 am: fa6c4eaf3e -s ours am: c1b87ecdc0 -s ours am: caab315bdb -s ours
am skip reason: Change-Id I28a4047b5f2051acc039084f65a71deb492d9dcb with SHA-1 dff8004275 is in history

Change-Id: I64d5204d5ae7c0f523078709020377e5f8fbc563
2020-05-20 01:45:58 +00:00
Yifan Hong
18b10d911c [automerger skipped] Add slot suffix to DAP ops am: 35d5e9f4cf am: 9f8b386056 -s ours am: bd312b8c65 -s ours am: 836342a972 -s ours
am skip reason: Change-Id Idbd0bfea142529a33dddb4d2debfc74513290730 with SHA-1 bc7e1db211 is in history

Change-Id: Ie55b19e26dd2a5f144dc163626862bba521b9141
2020-05-20 01:45:56 +00:00