Xin Li
ca8f152649
Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
Bug: 135460123
Change-Id: I4a95f6b87c4bd29b5b47531e6153315db52019f2
Merged-In: Ieb5298f552c800e60647be5a75f754f0df5b374d
2019-09-08 13:06:54 -07:00
Xin Li
7e7eae869c
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 8eb6e081d4
-s ours am: aba674b466
am: a43f9f02fc
...
am: b97b666c3b
-s ours
am skip reason: subject contains skip directive
Change-Id: I8553e17491fbd893491b22f9ce153a66bca2fadb
2019-09-05 13:49:06 -07:00
Xin Li
b97b666c3b
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 8eb6e081d4
-s ours am: aba674b466
...
am: a43f9f02fc
Change-Id: Ie20900ff13531453b8c9f9f9c1b3b69b41fd0bd4
2019-09-05 13:30:02 -07:00
Xin Li
a43f9f02fc
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 8eb6e081d4
-s ours
...
am: aba674b466
Change-Id: I6ba0ec377ffc15f44678a8134c6746003e60314e
2019-09-05 12:50:52 -07:00
Xin Li
aba674b466
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
...
am: 8eb6e081d4
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie3914e1c5861e05c8a58f6615aaa7b943f395397
2019-09-05 12:04:12 -07:00
Xin Li
8eb6e081d4
Merge "DO NOT MERGE - Merge Android 10 into master"
2019-09-05 16:53:35 +00:00
Xin Li
bdb5c17e60
DO NOT MERGE - Merge Android 10 into master
...
Bug: 139893257
Change-Id: Ieb5298f552c800e60647be5a75f754f0df5b374d
2019-09-04 13:34:19 -07:00
android-build-team Robot
040bebb1b9
Snap for 5746716 from 36c48e4023
to qt-c2f2-release
...
Change-Id: I4e6375053e6ba7a693067863d19a53bdf14f55d6
2019-07-23 03:11:40 +00:00
Tri Vo
46f868c31a
[automerger skipped] DO NOT MERGE Demote libpower_test to postsubmit am: 36c48e4023
...
am: e06086319a
-s ours
am skip reason: subject contains skip directive
Change-Id: I41ec528d25e3bcd3458a62dca3f8aac75bbaba0d
2019-07-22 12:02:37 -07:00
Tri Vo
e06086319a
DO NOT MERGE Demote libpower_test to postsubmit
...
am: 36c48e4023
Change-Id: Ie735752a564abba8a3bb1828c0cd9ae599df9504
2019-07-22 11:48:05 -07:00
Tri Vo
36c48e4023
DO NOT MERGE Demote libpower_test to postsubmit
...
The state of the test device w.r.t. root permissions is not guaranteed,
which leads to this test (and others) to be flaky.
Bug: 137888802
Test: n/a
Change-Id: Ieb87e3275289b11f843c18343e5d50a41c7b1993
(cherry picked from commit 329dbd296d
)
2019-07-19 18:27:56 +00:00
Xin Li
a4f710bec7
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: e6bfce1fab
...
am: 1f43543fa6
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia53113dfbac9b177198c77afcc5a8eafd5af1a79
2019-07-02 16:09:22 -07:00
Xin Li
1f43543fa6
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: e6bfce1fab
Change-Id: I887d7ec60945db4c883794996b7a8f6f760919dd
2019-07-02 13:21:54 -07:00
Xin Li
e6bfce1fab
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
Bug: 134405016
Change-Id: If15c8a3107ce7a275859783280760116063b9274
2019-07-01 20:59:53 +00:00
Tri Vo
bf65f21534
Merge "libpower: RAII wake lock implementation" am: a53a8a7193
am: aac0a1f5d3
am: 2843fd5f4a
...
am: 22eee32b19
Change-Id: Ib30c0b4e34bd4413a72d0bc963b9b2cb2b02b52e
2019-06-27 11:46:46 -07:00
Tri Vo
22eee32b19
Merge "libpower: RAII wake lock implementation" am: a53a8a7193
am: aac0a1f5d3
...
am: 2843fd5f4a
Change-Id: Ia4dff35ba25bafba4b6ef031e427505136306767
2019-06-27 09:12:26 -07:00
Tri Vo
2843fd5f4a
Merge "libpower: RAII wake lock implementation" am: a53a8a7193
...
am: aac0a1f5d3
Change-Id: Ie501bc93adbeb28fb364772b92d47427c46ad677
2019-06-26 19:43:16 -07:00
Tri Vo
aac0a1f5d3
Merge "libpower: RAII wake lock implementation"
...
am: a53a8a7193
Change-Id: Ib3347ed0e77073dda888a5bd126190d9e8ad8bf1
2019-06-26 19:29:37 -07:00
Tri Vo
a53a8a7193
Merge "libpower: RAII wake lock implementation"
2019-06-27 01:59:08 +00:00
Tri Vo
934f175a42
libpower: RAII wake lock implementation
...
Main motivation is to prevent wake lock leaks, e.g. b/133175847.
Changing power.h header breaks downstream vendor code that does C
linkage to that header b/135730848. Introduce new wakelock.h header.
Bug: 133175847
Test: boot blueline
Test: device suspends if left alone
Change-Id: I477123938ab20e954ce4d55b8588c0a116ed3882
2019-06-26 13:01:39 -07:00
Ruslan Tkhakokhov
c19e59f818
Merge "Merged-In Revert "libpower: RAII wake lock implementation"" am: 6e5d1db64b
am: 44e3795879
am: f830e916a0
...
am: b058a3da29
Change-Id: Ie72aed13b7a5f361da5703052ec0f605a0d89c65
2019-06-21 10:10:14 -07:00
Ruslan Tkhakokhov
b058a3da29
Merge "Merged-In Revert "libpower: RAII wake lock implementation"" am: 6e5d1db64b
am: 44e3795879
...
am: f830e916a0
Change-Id: Ic843215073dc6e15be899bcce1ea86ec26081971
2019-06-21 09:10:46 -07:00
Ruslan Tkhakokhov
f830e916a0
Merge "Merged-In Revert "libpower: RAII wake lock implementation"" am: 6e5d1db64b
...
am: 44e3795879
Change-Id: I58743ca5f63430eda716b15e72debb6cba4fb858
2019-06-21 08:27:52 -07:00
Ruslan Tkhakokhov
44e3795879
Merge "Merged-In Revert "libpower: RAII wake lock implementation""
...
am: 6e5d1db64b
Change-Id: I172a7823d23428da849d5fd15bb36dd96d3435d9
2019-06-21 08:08:17 -07:00
Ruslan Tkhakokhov
698a39a28a
Merged-In Revert "libpower: RAII wake lock implementation"
...
This reverts commit 23009bb199
.
Reason for revert: Breaks the build
Change-Id: I347928c4d444f4b1ce9d79f855c171626c0214c0
2019-06-21 11:43:46 +01:00
Ruslan Tkhakokhov
6e5d1db64b
Merge "Merged-In Revert "libpower: RAII wake lock implementation""
2019-06-21 10:34:43 +00:00
Ruslan Tkhakokhov
acf23a23e7
Merged-In Revert "libpower: RAII wake lock implementation"
...
This reverts commit 23009bb199
.
Reason for revert: Breaks the build
Change-Id: I347928c4d444f4b1ce9d79f855c171626c0214c0
2019-06-21 10:32:57 +00:00
Tri Vo
ece86297b7
Merge "libpower: RAII wake lock implementation" am: cc685232f7
am: 8fbabc2d9a
am: 9fcd627425
...
am: 9683806f95
Change-Id: I0abdc531dea958a96dcaf477cbd68720d8aa06ce
2019-06-20 17:46:57 -07:00
Tri Vo
9683806f95
Merge "libpower: RAII wake lock implementation" am: cc685232f7
am: 8fbabc2d9a
...
am: 9fcd627425
Change-Id: Id994c4574f8c359c1964753aa3d8aaeb7165a5b3
2019-06-20 16:35:48 -07:00
Tri Vo
9fcd627425
Merge "libpower: RAII wake lock implementation" am: cc685232f7
...
am: 8fbabc2d9a
Change-Id: I17e83309955abb6c3ebdb9b6f270a1a4d94ded10
2019-06-20 15:57:49 -07:00
Tri Vo
8fbabc2d9a
Merge "libpower: RAII wake lock implementation"
...
am: cc685232f7
Change-Id: Ia6a2bbfe192b7fccfe1ac0f8b10c3a420460c24c
2019-06-20 15:25:39 -07:00
Tri Vo
cc685232f7
Merge "libpower: RAII wake lock implementation"
2019-06-20 19:42:50 +00:00
Tri Vo
23009bb199
libpower: RAII wake lock implementation
...
Bug: 133175847
Test: boot blueline
Test: device suspends if left alone
Change-Id: I5a63fedabb18a9dcd510ca76303f54ec6c0b7f8c
2019-06-20 09:02:16 -07:00
Tri Vo
e87a46c1f6
Merge "libpower_test: require root on test device" am: 2f8294eec6
am: d48d28f042
am: 0c4ea927cb
...
am: b25c7541a1
Change-Id: I4785728c05ed7ce8ce761b6da52cef6108342f57
2019-06-15 17:23:03 -07:00
Tri Vo
b25c7541a1
Merge "libpower_test: require root on test device" am: 2f8294eec6
am: d48d28f042
...
am: 0c4ea927cb
Change-Id: I21700e0541c704620018addd2cd7725652e9a7a9
2019-06-15 17:16:03 -07:00
Tri Vo
0c4ea927cb
Merge "libpower_test: require root on test device" am: 2f8294eec6
...
am: d48d28f042
Change-Id: I7fdfd2de9afa7baa395b710cdd1fe0a0d9e1ac8e
2019-06-15 17:08:02 -07:00
Tri Vo
d48d28f042
Merge "libpower_test: require root on test device"
...
am: 2f8294eec6
Change-Id: I5f7fda168d0cf0e8c5267885270ffd2cb1552aac
2019-06-15 16:54:59 -07:00
Tri Vo
2f8294eec6
Merge "libpower_test: require root on test device"
2019-06-15 23:46:47 +00:00
Tri Vo
54ecb7ea67
libpower_test: require root on test device
...
And promote the test back to presubmit
Fixes: 134078730
Test: libpower_test
Change-Id: I2773bf57698460d98fbeba79659724b0ef75eaf3
2019-06-15 13:58:06 -07:00
Tri Vo
fdb5a1b54b
Merge "libpower: add error logs" am: 9462a528d1
am: 9f7dc4acfc
am: 6cb451db4d
...
am: 1de3066350
Change-Id: Id20d4685e8c0134354a284d72973e8b06896665e
2019-06-04 21:33:46 -07:00
Tri Vo
28bd895926
Merge "Demote libpower_test to postsubmit" am: 18e20caa81
am: 33c2c1f872
am: ca74aef185
...
am: cd6c0efa90
Change-Id: I965aa96100321abf43d5afdaab79aedd37c27e09
2019-06-04 21:17:15 -07:00
Tri Vo
1de3066350
Merge "libpower: add error logs" am: 9462a528d1
am: 9f7dc4acfc
...
am: 6cb451db4d
Change-Id: I4b031ab3969e1bc1c81f180baec9dcd291aea687
2019-06-04 20:12:54 -07:00
Tri Vo
cd6c0efa90
Merge "Demote libpower_test to postsubmit" am: 18e20caa81
am: 33c2c1f872
...
am: ca74aef185
Change-Id: I9988580c43bc024f761b3a24626e7eec8d1fa722
2019-06-04 19:58:24 -07:00
Tri Vo
6cb451db4d
Merge "libpower: add error logs" am: 9462a528d1
...
am: 9f7dc4acfc
Change-Id: Ib79ad75bb61e06d5f8697782e6bedb2d887cea9a
2019-06-04 19:31:22 -07:00
Tri Vo
ca74aef185
Merge "Demote libpower_test to postsubmit" am: 18e20caa81
...
am: 33c2c1f872
Change-Id: Ic8f6d2d477df41d20248eb4fe4a94967a4a22080
2019-06-04 19:25:02 -07:00
Tri Vo
9f7dc4acfc
Merge "libpower: add error logs"
...
am: 9462a528d1
Change-Id: Ie4351e8f245bd41246291cdc4917b4731ef0b2e4
2019-06-04 18:58:08 -07:00
Tri Vo
33c2c1f872
Merge "Demote libpower_test to postsubmit"
...
am: 18e20caa81
Change-Id: I5055e9877c651591456497b2b2ec2d7331333347
2019-06-04 17:57:31 -07:00
Tri Vo
9462a528d1
Merge "libpower: add error logs"
2019-06-05 00:26:00 +00:00
Tri Vo
18e20caa81
Merge "Demote libpower_test to postsubmit"
2019-06-04 18:16:36 +00:00
Tri Vo
329dbd296d
Demote libpower_test to postsubmit
...
The state of the test device w.r.t. root permissions is not guaranteed,
which leads to this test (and others) to be flaky.
Bug: 134078730
Test: n/a
Change-Id: Ieb87e3275289b11f843c18343e5d50a41c7b1993
2019-06-04 11:12:05 -07:00