Tom Cherry
9fa54d53ce
Merge "init: fix clang-tidy performance issues" am: 8a779ee959 am: fcbc44a371
...
am: 1154df5366
Change-Id: Ie65ff389c9291f09290c1810b3b47bedb0b82b72
2019-07-12 12:21:14 -07:00
Mark Salyzyn
0f23cf9ddb
Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden" am: bde9fc1787 am: bdd1ce8538
...
am: be843115fc
Change-Id: I929894305056e70be513cb34af363077e8958f22
2019-07-12 12:20:40 -07:00
Tom Cherry
1154df5366
Merge "init: fix clang-tidy performance issues" am: 8a779ee959
...
am: fcbc44a371
Change-Id: I57a5808ced1b7ce642b9643b7d46fc5915b25d4d
2019-07-12 12:10:57 -07:00
Mark Salyzyn
be843115fc
Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden" am: bde9fc1787
...
am: bdd1ce8538
Change-Id: I53eb16e4e61e899dab6e99a05bec9c69b98ec1d9
2019-07-12 12:10:22 -07:00
Tom Cherry
fcbc44a371
Merge "init: fix clang-tidy performance issues"
...
am: 8a779ee959
Change-Id: Ifeba3b1a962c33cf355fa897a7177845630be16a
2019-07-12 12:00:56 -07:00
Mark Salyzyn
bdd1ce8538
Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden"
...
am: bde9fc1787
Change-Id: I115026d227ceb9950020ebc97694d72c1fc04329
2019-07-12 12:00:19 -07:00
Daniel Norman
92de586ebf
Merge "Checks the interface inheritance hierarchy in init_rc files." am: 4b505fe3a8 am: 08c1556641
...
am: 739447f024
Change-Id: If314f13b5bab41a5283857b38e3c24d458736c23
2019-07-12 11:50:53 -07:00
Tom Cherry
8a779ee959
Merge "init: fix clang-tidy performance issues"
2019-07-12 18:49:49 +00:00
Daniel Norman
739447f024
Merge "Checks the interface inheritance hierarchy in init_rc files." am: 4b505fe3a8
...
am: 08c1556641
Change-Id: I03e1cd45e9a8370df71829015903facbed6c9171
2019-07-12 11:41:44 -07:00
Treehugger Robot
bde9fc1787
Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden"
2019-07-12 18:38:39 +00:00
Daniel Norman
08c1556641
Merge "Checks the interface inheritance hierarchy in init_rc files."
...
am: 4b505fe3a8
Change-Id: Ic479fb46d293260589154c6ce0bf844952c8dd26
2019-07-12 11:32:48 -07:00
Tom Cherry
398f328c6a
Merge "init: Write the reason in BCB on "reboot recovery"" am: e7a010de01 am: da80b0debc
...
am: cc9d1e20e8
Change-Id: Ifeb69d8949df913621cb58ed918ccc89917cea82
2019-07-12 11:13:46 -07:00
Tom Cherry
cc9d1e20e8
Merge "init: Write the reason in BCB on "reboot recovery"" am: e7a010de01
...
am: da80b0debc
Change-Id: Iafb8f0493bbfdbc0817d8c2877dab08b03a97739
2019-07-12 11:03:03 -07:00
Mark Salyzyn
6a913da265
Merge "init: powerctl support and propagate longer canonical reboot reasons." am: 5c296a0003 am: 3efb204d73
...
am: 30ea453059
Change-Id: I29603ec2e1565ee7965a8ee3e9e7a915e5fa69d3
2019-07-12 11:02:05 -07:00
Daniel Norman
4b505fe3a8
Merge "Checks the interface inheritance hierarchy in init_rc files."
2019-07-12 18:01:46 +00:00
Tom Cherry
da80b0debc
Merge "init: Write the reason in BCB on "reboot recovery""
...
am: e7a010de01
Change-Id: I3c627e207396e754b56a00d6919ef5a8c2b459b7
2019-07-12 10:54:42 -07:00
Mark Salyzyn
30ea453059
Merge "init: powerctl support and propagate longer canonical reboot reasons." am: 5c296a0003
...
am: 3efb204d73
Change-Id: I7f5c94b7c3f9e4a7a6e313b5e87d71a9972aefd7
2019-07-12 10:53:05 -07:00
Mark Salyzyn
3efb204d73
Merge "init: powerctl support and propagate longer canonical reboot reasons."
...
am: 5c296a0003
Change-Id: Ief8ece1dd4dda9315bc3d0b0213c518a1af2f721
2019-07-12 10:42:02 -07:00
Tom Cherry
e7a010de01
Merge "init: Write the reason in BCB on "reboot recovery""
2019-07-12 17:39:32 +00:00
Treehugger Robot
5c296a0003
Merge "init: powerctl support and propagate longer canonical reboot reasons."
2019-07-12 17:37:25 +00:00
Gerry Fan
cef7b4f475
Merge "Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev am: ff7da227db
...
am: 3f17869556
Change-Id: I5447eea42d8c0a8d0c031616c8c2de6e896837b1
2019-07-12 10:33:31 -07:00
Gerry Fan
85316e7bad
Merge "Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev am: ff7da227db
...
am: c9aff9869d
Change-Id: If7bdc7163796d078ff8bc968849089087129d3d8
2019-07-12 10:33:02 -07:00
Steven Moreland
d271b91cab
Merge "libutils: remove references to unimplemented func" am: 67a0dd4e27 am: 4f8a4b095d
...
am: 023a4282e0
Change-Id: I7e40da00c69b0ba17ae01d7d2b3587d870ba3c04
2019-07-12 10:28:56 -07:00
Steven Moreland
3808dfec75
Merge "libadbd_services: remove unused deps" am: a1821e13f3 am: 1c9abb85cb
...
am: e482b3a98f
Change-Id: I3319b1eae6223b13514c71d153354242e505ab58
2019-07-12 10:28:16 -07:00
Gerry Fan
3f17869556
Merge "Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev
...
am: ff7da227db
Change-Id: I6f6ec4b8472a3017c47d49a910e9ca982cae6eff
2019-07-12 10:24:00 -07:00
Gerry Fan
c9aff9869d
Merge "Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev
...
am: ff7da227db
Change-Id: I42b5fdcdb6b87afe44353d830f6b1b5c0c645fc0
2019-07-12 10:24:00 -07:00
Steven Moreland
023a4282e0
Merge "libutils: remove references to unimplemented func" am: 67a0dd4e27
...
am: 4f8a4b095d
Change-Id: I59478690f8c6d78eea7fb9d6accc81f053c7ae5d
2019-07-12 10:20:33 -07:00
Steven Moreland
e482b3a98f
Merge "libadbd_services: remove unused deps" am: a1821e13f3
...
am: 1c9abb85cb
Change-Id: Ia37257bdda219c46b6e2a7dd5b54062cdd1c45cc
2019-07-12 10:19:48 -07:00
Steven Moreland
4f8a4b095d
Merge "libutils: remove references to unimplemented func"
...
am: 67a0dd4e27
Change-Id: I5d7f1e8f3fa31054338973f1c66f2d56fddc1428
2019-07-12 10:11:35 -07:00
Gerry Fan
ff7da227db
Merge "Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev
2019-07-12 17:11:23 +00:00
Steven Moreland
1c9abb85cb
Merge "libadbd_services: remove unused deps"
...
am: a1821e13f3
Change-Id: I8ebee3fde274c70f60b3419c3dc920de51a87213
2019-07-12 10:10:55 -07:00
Steven Moreland
67a0dd4e27
Merge "libutils: remove references to unimplemented func"
2019-07-12 16:48:04 +00:00
Steven Moreland
a1821e13f3
Merge "libadbd_services: remove unused deps"
2019-07-12 16:36:16 +00:00
Christopher Ferris
ddf3aad381
[automerger skipped] Merge changes Ie0e6e716,I8adc169b into qt-r1-dev
...
am: d2e75075e9 -s ours
am skip reason: change_id Ie0e6e71671a8a3e26b4632f93bb2af089a20e2e0 with SHA1 d943301990 is in history
Change-Id: Ib62a5fa81b8aa75a1fcac6d01a5c87b7da708d0e
2019-07-12 08:36:08 -07:00
Gerry Fan
997a2d93d7
Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""
...
This reverts commit 891a011394 .
Reason for revert: Some Test failed, need more investigation
Bug: 136199978
Change-Id: Ibad0dad02a6701447c39ddcc805d44c9e68bdcce
2019-07-12 15:23:12 +00:00
Christopher Ferris
d2e75075e9
Merge changes Ie0e6e716,I8adc169b into qt-r1-dev
...
* changes:
Fix error printing code.
Cache only a small portion of page map data.
2019-07-12 15:15:57 +00:00
Android Build Merger (Role)
1b3cfda0f2
Merge "Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-dev am: 346c17bbc9 am: 3061693f5d" into qt-r1-dev-plus-aosp
2019-07-12 09:58:33 +00:00
Hung-ying Tyan
ad5213c412
Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-dev am: 346c17bbc9
...
am: 3061693f5d
Change-Id: I13e7187c45fa6c5963e3c69bcd3bdb87e86e6174
2019-07-12 02:58:23 -07:00
Hung-ying Tyan
415110595b
Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-dev am: 346c17bbc9
...
am: b8aaa13a5f
Change-Id: Ib33cd581f66b470ec5d8c289e34d4866931517a9
2019-07-12 02:58:08 -07:00
Hung-ying Tyan
3061693f5d
Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-dev
...
am: 346c17bbc9
Change-Id: I1c99ad74d9b1ee7e486183b4c62ec732d2d23114
2019-07-12 02:49:38 -07:00
Hung-ying Tyan
b8aaa13a5f
Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-dev
...
am: 346c17bbc9
Change-Id: I501695115c2c84345db0c78e8694fd31686b7ee7
2019-07-12 02:49:37 -07:00
Hung-ying Tyan
346c17bbc9
Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-dev
2019-07-12 09:27:01 +00:00
Steven Moreland
c0927e64b1
libutils: remove references to unimplemented func
...
printWeakPointer isn't implemented anywhere. This also allows us to
remove a forward declaration of TextOutput.
Bug: N/A
Test: N/A
Change-Id: Ie2debdfda17b7cc1d599c431eaf4c362a591e482
2019-07-11 17:50:52 -07:00
Steven Moreland
2a6c401d3b
Merge "Remove binder dependency in init." am: 4280165ae0 am: 538b50d9d5
...
am: 6f2eeabbcc
Change-Id: I5677366e3ba83bd9495286e37d54592ded016f3c
2019-07-11 17:27:11 -07:00
Gerry Fan
891a011394
Revert "rootdir / sdcard : Stop creating /data/media/obb."
...
This reverts commit c6ca823710 .
Reason for revert: Q-GSI on Pie devices would crash kernel.
Bug: 136199978
Change-Id: I16a2cb81a1f21627db0cb00324679a322ba42fe0
2019-07-12 00:16:06 +00:00
Steven Moreland
e0d94b6493
libadbd_services: remove unused deps
...
Bug: 137311188
Test: library still builds
Change-Id: I52e110ddfda073c833e86194eaf7a9502b9181a6
2019-07-11 16:13:10 -07:00
Daniel Norman
3f42a767cd
Checks the interface inheritance hierarchy in init_rc files.
...
Bug: 118016875
Test: Added 'interface' lines to an init_rc file and observed errors
when misspelled or missing entire inheritance hierarchy.
Change-Id: I681420f15539742d8415808b2a0dcbf0bf6faaf1
2019-07-11 14:43:11 -07:00
Steven Moreland
6f2eeabbcc
Merge "Remove binder dependency in init." am: 4280165ae0
...
am: 538b50d9d5
Change-Id: I570719645f98326c76e1943573686e044b48723b
2019-07-11 14:40:12 -07:00
Steven Moreland
538b50d9d5
Merge "Remove binder dependency in init."
...
am: 4280165ae0
Change-Id: I54ee7ce313210ff47c62ad417c96da40a03cbb29
2019-07-11 14:32:21 -07:00
Steven Moreland
4280165ae0
Merge "Remove binder dependency in init."
2019-07-11 20:56:12 +00:00