Commit graph

9243 commits

Author SHA1 Message Date
Automerger Merge Worker
b55c48abf7 Merge "Track rename of adbd_system_binaries. am: 4473e1689f am: 08829ec180" into rvc-d1-dev-plus-aosp am: 9fabdc9402
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11795073

Change-Id: I9c6cdec9ce0b3f8deffc9fde5d07d8377c722e47
2020-06-08 23:49:25 +00:00
Josh Gao
f80ac9274c Track rename of adbd_system_binaries. am: 4473e1689f am: 1fa494a288 am: 35bc9cec72
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11795073

Change-Id: I510875f5ed8df0706fcb3099dc68658a5ac087f2
2020-06-08 23:49:01 +00:00
Josh Gao
84ba5cff04 Track rename of adbd_system_binaries. am: 4473e1689f am: 1fa494a288 am: 537c52534c
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11795073

Change-Id: I9007ce3763505c2bed98764068be012af0178f48
2020-06-08 23:48:48 +00:00
Automerger Merge Worker
9fabdc9402 Merge "Track rename of adbd_system_binaries. am: 4473e1689f am: 08829ec180" into rvc-d1-dev-plus-aosp 2020-06-08 23:37:19 +00:00
Josh Gao
fb22f937ad Track rename of adbd_system_binaries. am: 4473e1689f am: 08829ec180
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11795073

Change-Id: I86940c531b0d4c57cffcf78a6db4c52cc25c2726
2020-06-08 23:37:11 +00:00
Josh Gao
35bc9cec72 Track rename of adbd_system_binaries. am: 4473e1689f am: 1fa494a288
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11795073

Change-Id: Ifb542f699bb6ddd98929999347267823fb3a32e1
2020-06-08 23:37:08 +00:00
Josh Gao
537c52534c Track rename of adbd_system_binaries. am: 4473e1689f am: 1fa494a288
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11795073

Change-Id: Iadf0a66333e408a46e379dda85839af14af032c2
2020-06-08 23:37:04 +00:00
Josh Gao
0201a84d53 Track rename of adbd_system_binaries. am: 4473e1689f
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11795073

Change-Id: I2c85587e09a5a6598da089c054425aa3be13f84f
2020-06-08 23:23:51 +00:00
Josh Gao
08829ec180 Track rename of adbd_system_binaries. am: 4473e1689f
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11795073

Change-Id: I5885936ef87ac207e01b3ca482f67715cd26b284
2020-06-08 23:23:39 +00:00
Josh Gao
1fa494a288 Track rename of adbd_system_binaries. am: 4473e1689f
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/11795073

Change-Id: I5286e4cf7ac2446fd0547cc1cd6e3aeb1bf2e8fe
2020-06-08 23:23:35 +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
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
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
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
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
Yifan Hong
041a5f535f [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 skip reason: Change-Id I629a533a67966d46d9cd87a59c6b9af26daf1667 with SHA-1 2a4afd29a1 is in history

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

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

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

Change-Id: Ibb4ac10ebf5910a4d22e9d82937b8efcb4272900
2020-05-20 01:29:41 +00:00
Treehugger Robot
c1b87ecdc0 [automerger skipped] Merge changes from topic "nonab_pkg" am: 31deac96f4 am: fa6c4eaf3e -s ours
am skip reason: Change-Id I28a4047b5f2051acc039084f65a71deb492d9dcb with SHA-1 dff8004275 is in history

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

Change-Id: I8415babf316f8e903ce64a9d5e35867a4381c99a
2020-05-20 01:11:10 +00:00
Yifan Hong
3e5cc2207c [automerger skipped] Detect non-A/B vs. A/B packages correctly. am: f2af5629d2 am: d5c56cee29 -s ours
am skip reason: Change-Id I629a533a67966d46d9cd87a59c6b9af26daf1667 with SHA-1 2a4afd29a1 is in history

Change-Id: Ifa8914b5d2568de6f2da218ec3708a7390d7e5ef
2020-05-20 01:11:07 +00:00
Treehugger Robot
fa6c4eaf3e Merge changes from topic "nonab_pkg" am: 31deac96f4
Change-Id: Ia8346a98754029a04a88d7d26f3c789530583e1f
2020-05-20 00:55:04 +00:00