OSDN Git Service
Alistair Strachan [Thu, 15 Jun 2017 17:36:48 +0000 (17:36 +0000)]
Fix getDisplayInfo() for SurfaceFlinger in HWC2 mode. am:
c175253b6d am:
d8449e55a6
am:
45c28e4a5e
Change-Id: I663702bd8a4744e3d7fb0cd349178d6838221ddd
Alistair Strachan [Thu, 15 Jun 2017 17:33:17 +0000 (17:33 +0000)]
Fix getDisplayInfo() for SurfaceFlinger in HWC2 mode. am:
c175253b6d
am:
d8449e55a6
Change-Id: I400998a8226e19fb54f5cb981630841ee8d288ef
Alistair Strachan [Thu, 15 Jun 2017 17:30:19 +0000 (17:30 +0000)]
Fix getDisplayInfo() for SurfaceFlinger in HWC2 mode.
am:
c175253b6d
Change-Id: I55ca473facef90f00eb1a401d9bc8ad7a36e4878
Alistair Strachan [Wed, 7 Jun 2017 23:34:44 +0000 (16:34 -0700)]
Fix getDisplayInfo() for SurfaceFlinger in HWC2 mode.
When HWC2 mode is enabled in SurfaceFlinger, the getDisplayInfo()
function would fail to return the correct active mode in some cases.
This bug was only noticable if you had more than one mode registered
by the HWC2 backend.
The SurfaceComposerClient::getDisplayInfo() function works by calling
getDisplayConfigs(), and de-referencing the config at the index
returned by getActiveConfig(). The active config returned was correct,
but the getDisplayConfigs() array was not properly sorted.
Tracing this back, this problem occurs because the configId is stored
alongside the config in an unordered_map, so when this is converted
to a vector and the configId is discarded, the conversion must be
sorted correctly; it can't just be the hash order returned from
the unordered_map.
There are a few ways to fix this problem, but the easiest was to nip
the problem in the bud by not allowing an unsorted list of configs
to exist on the base HWC2 class. It may be better still to just get
rid of the map and go back to a vector, as this data is more often
used as an array than it is indexed by configId, so the use of an
unordered_map was probably overkill.
Change-Id: Ibfb015a6d9b49c870f37a1c892f15f90abbd1e2c
Bug:
62617569
Test: ./cts-tradefed run cts -m CtsViewTestCases -t android.view.cts.DisplayRefreshRateTest#testRefreshRate
TreeHugger Robot [Wed, 14 Jun 2017 22:27:39 +0000 (22:27 +0000)]
Merge "Support 180-degree screen rotation for RSB."
Eino-Ville Talvala [Wed, 14 Jun 2017 08:18:20 +0000 (08:18 +0000)]
Merge "Merge changes Ibc1444b8,I14c200d1 into oc-dev am:
fd43dc6723 am:
eb444d602c" into oc-dr1-dev-plus-aosp
am:
8b689d1683
Change-Id: If251537b609fa2827b886ddc847c963a9588fcb5
Eino-Ville Talvala [Wed, 14 Jun 2017 08:18:00 +0000 (08:18 +0000)]
Merge changes Ibc1444b8,I14c200d1 into oc-dev am:
fd43dc6723 am:
b209c12155
am:
4b91f8c362
Change-Id: I1a58f54f316beaa2139250c95b8f1c26f5040ade
Android Build Merger (Role) [Wed, 14 Jun 2017 08:15:48 +0000 (08:15 +0000)]
Merge "Merge changes Ibc1444b8,I14c200d1 into oc-dev am:
fd43dc6723 am:
eb444d602c" into oc-dr1-dev-plus-aosp
Eino-Ville Talvala [Wed, 14 Jun 2017 08:15:30 +0000 (08:15 +0000)]
Merge changes Ibc1444b8,I14c200d1 into oc-dev am:
fd43dc6723
am:
b209c12155
Change-Id: I9da639be63a43343d236c865aa810957290e2e49
Eino-Ville Talvala [Wed, 14 Jun 2017 08:15:30 +0000 (08:15 +0000)]
Merge changes Ibc1444b8,I14c200d1 into oc-dev am:
fd43dc6723
am:
eb444d602c
Change-Id: I5c01a250bf9422b23210fc6860676c60ed33c172
Eino-Ville Talvala [Wed, 14 Jun 2017 08:13:01 +0000 (08:13 +0000)]
Merge changes Ibc1444b8,I14c200d1 into oc-dev
am:
fd43dc6723
Change-Id: Iae111bcc2770c1e75aba29021e31d07ff89243ab
Eino-Ville Talvala [Wed, 14 Jun 2017 08:13:00 +0000 (08:13 +0000)]
Merge changes Ibc1444b8,I14c200d1 into oc-dev
am:
fd43dc6723
Change-Id: I7a63dd4d785a3bc4e386cc10a427b12d678e7b28
Eino-Ville Talvala [Wed, 14 Jun 2017 08:09:40 +0000 (08:09 +0000)]
Merge changes Ibc1444b8,I14c200d1 into oc-dev
* changes:
ConsumerBase: discardFreeBuffers() also needs to dump its own cache
BufferQueueProducer: Call onBuffersReleased() in detachNextBuffer
Peng Xu [Wed, 14 Jun 2017 06:45:18 +0000 (06:45 +0000)]
Merge changes from topic 'sensor_looper_crash' into oc-dev am:
638055ef41 am:
642e5511f4
am:
659c063b31
Change-Id: Ifdce9ab4644d58c22a7056fd68ae168973e58ded
Yifan Hong [Wed, 14 Jun 2017 06:44:57 +0000 (06:44 +0000)]
SensorManager: attach background thread to JavaVM am:
09034f076e am:
e1ae771108
am:
13ba0489bf
Change-Id: If8cbd3e3785189b624904603639c04bbc706708e
Yifan Hong [Wed, 14 Jun 2017 06:43:02 +0000 (06:43 +0000)]
Framework sensor manager init not depends on ::android::SensorManager. am:
542eace6bf am:
7c4c5860c0 -s ours
am:
b7d502bec6 -s ours
Change-Id: I4fcd0353c12d5fa51645d7266fa5670bdfd70143
Peng Xu [Wed, 14 Jun 2017 06:37:17 +0000 (06:37 +0000)]
Merge changes from topic 'sensor_looper_crash' into oc-dev am:
638055ef41 am:
91768a2bfe
am:
063a42c499
Change-Id: I912eea3bd90446147566ef9334663b7f320d1f84
Yifan Hong [Wed, 14 Jun 2017 06:36:58 +0000 (06:36 +0000)]
SensorManager: attach background thread to JavaVM am:
09034f076e am:
fc045b9de4
am:
02bd71ae6f
Change-Id: Id2d5290e4a127021bde68d0ede978c4064d9bb2e
Yifan Hong [Wed, 14 Jun 2017 06:36:39 +0000 (06:36 +0000)]
Framework sensor manager init not depends on ::android::SensorManager. am:
542eace6bf -s ours am:
401b0f43ee -s ours
am:
aae65dac18 -s ours
Change-Id: I0162ef587ade455b03e8316017e6c23f81e84ce6
Peng Xu [Wed, 14 Jun 2017 06:32:24 +0000 (06:32 +0000)]
Merge changes from topic 'sensor_looper_crash' into oc-dev am:
638055ef41
am:
642e5511f4
Change-Id: I5c5bacff22639e8e5457cc9bfdc9ac728a76473c
Yifan Hong [Wed, 14 Jun 2017 06:32:14 +0000 (06:32 +0000)]
SensorManager: attach background thread to JavaVM am:
09034f076e
am:
e1ae771108
Change-Id: I9565d4edc4e56589f38fe297b19a4a5abb87c7ac
Yifan Hong [Wed, 14 Jun 2017 06:32:05 +0000 (06:32 +0000)]
Framework sensor manager init not depends on ::android::SensorManager. am:
542eace6bf
am:
7c4c5860c0 -s ours
Change-Id: Ic92c39e375542d214273c7ba89dcb0020a34bd93
Peng Xu [Wed, 14 Jun 2017 06:28:22 +0000 (06:28 +0000)]
Merge changes from topic 'sensor_looper_crash' into oc-dev am:
638055ef41
am:
91768a2bfe
Change-Id: Ib1eabf66f2658de1adca4133c20fb4b9fdc71526
Yifan Hong [Wed, 14 Jun 2017 06:28:11 +0000 (06:28 +0000)]
SensorManager: attach background thread to JavaVM am:
09034f076e
am:
fc045b9de4
Change-Id: I2a0ddc2040000e6c7cc27d70812f9429fcea6c61
Yifan Hong [Wed, 14 Jun 2017 06:28:01 +0000 (06:28 +0000)]
Framework sensor manager init not depends on ::android::SensorManager. am:
542eace6bf -s ours
am:
401b0f43ee -s ours
Change-Id: Ib932c565af2ee3d968595b265a259f988fca57a0
Peng Xu [Wed, 14 Jun 2017 06:20:52 +0000 (06:20 +0000)]
Merge changes from topic 'sensor_looper_crash' into oc-dev
am:
638055ef41
Change-Id: I774229e9c84e7b390861638e478e2330b66c3d57
Peng Xu [Wed, 14 Jun 2017 06:20:49 +0000 (06:20 +0000)]
Merge changes from topic 'sensor_looper_crash' into oc-dev
am:
638055ef41
Change-Id: Ib48966c671e1cedb7ed1d26498b8389a62e30921
Yifan Hong [Wed, 14 Jun 2017 06:20:42 +0000 (06:20 +0000)]
SensorManager: attach background thread to JavaVM
am:
09034f076e
Change-Id: I07364b649a58f9ca0891407540a607967155bf4b
Yifan Hong [Wed, 14 Jun 2017 06:20:40 +0000 (06:20 +0000)]
SensorManager: attach background thread to JavaVM
am:
09034f076e
Change-Id: Ib32d5a33c7de35d9d1181fc737848ba63fe94171
Yifan Hong [Wed, 14 Jun 2017 06:20:31 +0000 (06:20 +0000)]
Framework sensor manager init not depends on ::android::SensorManager.
am:
542eace6bf
Change-Id: I8228b3afec41260135c4123fe8cd9e9dc99f46e5
Yifan Hong [Wed, 14 Jun 2017 06:20:31 +0000 (06:20 +0000)]
Framework sensor manager init not depends on ::android::SensorManager.
am:
542eace6bf -s ours
Change-Id: I846d806f4d135a8c353f10ea514a3cdedd22cd85
Peng Xu [Wed, 14 Jun 2017 06:12:37 +0000 (06:12 +0000)]
Merge changes from topic 'sensor_looper_crash' into oc-dev
* changes:
Fix race condition for SensorManager looper.
SensorManager: attach background thread to JavaVM
Framework sensor manager init not depends on ::android::SensorManager.
Yifan Hong [Wed, 14 Jun 2017 01:04:25 +0000 (18:04 -0700)]
Fix race condition for SensorManager looper.
Before the fix there could be two background threads started for two
loopers. Add a guard to prevent this from happening.
Test: pass
Bug:
62404135
Change-Id: I8230addaaa6b83670d7b83c96809b00fca95d352
Yifan Hong [Wed, 14 Jun 2017 00:51:13 +0000 (17:51 -0700)]
SensorManager: attach background thread to JavaVM
Test: pass
Bug:
62404135
Change-Id: I63a128c3c933904211f5ff2483492674eaba93ed
Yifan Hong [Tue, 9 May 2017 22:18:02 +0000 (15:18 -0700)]
Framework sensor manager init not depends on ::android::SensorManager.
Test: photo sphere
Change-Id: Ice37a758421827757226a9898bcf3e00857443ff
Merged-In: Ice37a758421827757226a9898bcf3e00857443ff
Fixes:
36448245
Okan Arikan [Wed, 14 Jun 2017 00:54:52 +0000 (00:54 +0000)]
Merge "Resurrect the pose tool." into oc-dr1-dev am:
5af190c517
am:
b71fc2624a
Change-Id: Ie96fb61dcc1494f126394a4138729489188186b2
Okan Arikan [Wed, 14 Jun 2017 00:38:03 +0000 (00:38 +0000)]
Merge "Resurrect the pose tool." into oc-dr1-dev
am:
5af190c517
Change-Id: I8af4bac4553638fb4a2a1994e9d590e96f796a51
TreeHugger Robot [Wed, 14 Jun 2017 00:22:21 +0000 (00:22 +0000)]
Merge "Resurrect the pose tool." into oc-dr1-dev
Eino-Ville Talvala [Wed, 14 Jun 2017 00:09:11 +0000 (17:09 -0700)]
ConsumerBase: discardFreeBuffers() also needs to dump its own cache
ConsumerBase has its own cached slots with graphic buffer references,
so it's not enough to just ask the buffer queue consumer to free
buffers.
Add code equivalent to what happens in the onBuffersReleased callback.
Test:
Bug:
62593139
Change-Id: Ibc1444b868c6150aa2da1c209e06bdba42f1595d
TreeHugger Robot [Tue, 13 Jun 2017 23:55:16 +0000 (23:55 +0000)]
Merge "Add DVR method to get native display metrics"
Eino-Ville Talvala [Tue, 13 Jun 2017 23:39:11 +0000 (16:39 -0700)]
BufferQueueProducer: Call onBuffersReleased() in detachNextBuffer
Like detachBuffer(), detachNextBuffer() needs to inform the consumer,
who generally has a cache of buffer items, that a buffer is no longer
owned by the buffer queue.
Otherwise the consumer layer can leak the buffer reference until
consumer teardown/disconnect.
Test: Camera CTS is fine, using a camera app shows correct memory
behavior
Bug:
62591036
Change-Id: I14c200d13e60dbbe21261343941f84fb786db117
TreeHugger Robot [Tue, 13 Jun 2017 22:34:24 +0000 (22:34 +0000)]
Merge "Adding package name for HIDL connection and default package name"
Stephen Kiazyk [Fri, 9 Jun 2017 21:26:31 +0000 (14:26 -0700)]
Add DVR method to get native display metrics
This seems like the kind of infomration we should be able to communicate
to vrcore.
Bug:
62494565
Test: Builds and loads, still need to test with vrcore
Change-Id: I2342fabcd2bcb8a34c0b783391b60defc381f3c6
Joel Fernandes [Tue, 13 Jun 2017 20:26:42 +0000 (20:26 +0000)]
Merge "atrace.rc: Correct path to saved_cmdlines_size when setting permission am:
922e418f45 am:
83e73f35d6" into oc-dr1-dev-plus-aosp
am:
5b06731e61
Change-Id: I07d20633206d6e7286dff3debfc9a8ff9d6a62ea
Joel Fernandes [Tue, 13 Jun 2017 20:26:15 +0000 (20:26 +0000)]
atrace.rc: Correct path to saved_cmdlines_size when setting permission am:
922e418f45 am:
bf16598142
am:
af3737c66d
Change-Id: I761902eb198c487904b0b381b9829524480e43e9
Android Build Merger (Role) [Tue, 13 Jun 2017 20:22:34 +0000 (20:22 +0000)]
Merge "atrace.rc: Correct path to saved_cmdlines_size when setting permission am:
922e418f45 am:
83e73f35d6" into oc-dr1-dev-plus-aosp
Joel Fernandes [Tue, 13 Jun 2017 20:22:16 +0000 (20:22 +0000)]
atrace.rc: Correct path to saved_cmdlines_size when setting permission am:
922e418f45
am:
bf16598142
Change-Id: Ia489f46bc7be10fc877d709eedc70ca49be53c3b
Joel Fernandes [Tue, 13 Jun 2017 20:22:14 +0000 (20:22 +0000)]
atrace.rc: Correct path to saved_cmdlines_size when setting permission am:
922e418f45
am:
83e73f35d6
Change-Id: I0e081393abcb36b99ced7000a075cc7ef5e1825e
Joel Fernandes [Tue, 13 Jun 2017 20:18:14 +0000 (20:18 +0000)]
atrace.rc: Correct path to saved_cmdlines_size when setting permission
am:
922e418f45
Change-Id: I99862d8e16d1c10405a696b89553a855881c967a
Joel Fernandes [Tue, 13 Jun 2017 20:18:14 +0000 (20:18 +0000)]
atrace.rc: Correct path to saved_cmdlines_size when setting permission
am:
922e418f45
Change-Id: If92363cbd1ad525aa6b65e255cc86d7d6005ad25
Okan Arikan [Mon, 5 Jun 2017 23:21:42 +0000 (16:21 -0700)]
Resurrect the pose tool.
Editing the tool to look into the same broadcast ring that
VrCore reads from.
Bug:
62355308
Test: Run pose tool
Change-Id: I270e3934c7df398048701a81851ee860a8acb712
(cherry picked from commit
2a4d63ce1737705fff6def88e68b2e537db9074c)
Joel Fernandes [Tue, 13 Jun 2017 03:47:27 +0000 (20:47 -0700)]
atrace.rc: Correct path to saved_cmdlines_size when setting permission
Bug:
62375794
Test: CTS test
Change-Id: Ie252be152ba26aced63af55734d3155ad93f2919
Signed-off-by: Joel Fernandes <joelaf@google.com>
(cherry picked from commit
0094a2d5962ed81c6c624c900450d84f1967ba49)
Joel Fernandes [Tue, 13 Jun 2017 19:44:27 +0000 (19:44 +0000)]
Merge "atrace.rc: Correct path to saved_cmdlines_size when setting permission"
Wei Wang [Tue, 13 Jun 2017 18:56:08 +0000 (18:56 +0000)]
dumpstate: Better format for dumping block stat am:
1dc1ef5af5
am:
cd898d6a44
Change-Id: I15a2ccc9390a4650c8ec041bcf083d6ebf269628
Wei Wang [Tue, 13 Jun 2017 18:52:07 +0000 (18:52 +0000)]
dumpstate: Better format for dumping block stat
am:
1dc1ef5af5
Change-Id: Ida45ae1d195ace8aed23e98be6eaf50742e47c7f
Joel Fernandes [Tue, 13 Jun 2017 03:47:27 +0000 (20:47 -0700)]
atrace.rc: Correct path to saved_cmdlines_size when setting permission
Bug:
62375794
Change-Id: Ie252be152ba26aced63af55734d3155ad93f2919
Signed-off-by: Joel Fernandes <joelaf@google.com>
Peng Xu [Thu, 8 Jun 2017 22:08:39 +0000 (15:08 -0700)]
Adding package name for HIDL connection and default package name
This helps debugging native connection and hidl connections.
Test: dumpsys sensorservice display information as expected.
Bug:
62446956
Change-Id: I1cb1ecd3a7398ccf4fddfb36cc5946826f48027b
Wei Wang [Mon, 12 Jun 2017 18:28:37 +0000 (11:28 -0700)]
dumpstate: Better format for dumping block stat
After CL the format looks like:
------ BLOCK STAT (/sys/block/mmcblk0) ------
Block-Dev : R-IOs R-merg R-sect R-wait W-IOs W-merg W-sect W-wait in-fli activ T-wait
/mmcblk0/stat : 11299 16093
1262592 31863 3895 2968 63232 6463 0 10260 38243
/mmcblk0/stat : perf(ios) rd: 75622KB/s(1322/s) wr: 18671KB/s(2246/s) q: 4
Block-Dev : R-IOs R-merg R-sect R-wait W-IOs W-merg W-sect W-wait in-fli activ T-wait
/mmcblk0/mmcblk0p1/stat : 37 29 66 6 0 0 0 0 0 6 6
/mmcblk0/mmcblk0p1/stat : perf(ios) rd: 5632KB/s(6167/s) q: 1
Block-Dev : R-IOs R-merg R-sect R-wait W-IOs W-merg W-sect W-wait in-fli activ T-wait
/mmcblk0/mmcblk0p24/stat : 12 32 346 0 1 0 8 0 0 0 0
Block-Dev : R-IOs R-merg R-sect R-wait W-IOs W-merg W-sect W-wait in-fli activ T-wait
/mmcblk0/mmcblk0p26/stat : 0 0 0 0 3 381 3072 296 0 100 296
/mmcblk0/mmcblk0p26/stat : perf(ios) rd: 0KB/s(0/s) wr: 15729KB/s(30/s) q: 3
Block-Dev : R-IOs R-merg R-sect R-wait W-IOs W-merg W-sect W-wait in-fli activ T-wait
/mmcblk0/mmcblk0p30/stat : 11 33 352 23 0 0 0 0 0 23 23
/mmcblk0/mmcblk0p30/stat : perf(ios) rd: 7836KB/s(478/s) q: 1
Block-Dev : R-IOs R-merg R-sect R-wait W-IOs W-merg W-sect W-wait in-fli activ T-wait
/mmcblk0/mmcblk0p38/stat : 1 3 32 0 0 0 0 0 0 0 0
Block-Dev : R-IOs R-merg R-sect R-wait W-IOs W-merg W-sect W-wait in-fli activ T-wait
/mmcblk0/mmcblk0p39/stat : 816 1072 47000 3460 0 0 0 0 0 273 3460
/mmcblk0/mmcblk0p39/stat : perf(ios) rd: 88147KB/s(2989/s) q: 13
Block-Dev : R-IOs R-merg R-sect R-wait W-IOs W-merg W-sect W-wait in-fli activ T-wait
/mmcblk0/mmcblk0p40/stat : 17 13 228 0 4 0 32 3 0 3 3
/mmcblk0/mmcblk0p40/stat : perf(ios) rd: 0KB/s(0/s) wr: 5461KB/s(1333/s) q: 1
Block-Dev : R-IOs R-merg R-sect R-wait W-IOs W-merg W-sect W-wait in-fli activ T-wait
/mmcblk0/mmcblk0p41/stat : 4831 14319 453376 17336 0 0 0 0 0 3273 17330
/mmcblk0/mmcblk0p41/stat : perf(ios) rd: 70898KB/s(1476/s) q: 5
Block-Dev : R-IOs R-merg R-sect R-wait W-IOs W-merg W-sect W-wait in-fli activ T-wait
/mmcblk0/mmcblk0p42/stat : 8 124 1056 3 0 0 0 0 0 3 3
/mmcblk0/mmcblk0p42/stat : perf(ios) rd: 180224KB/s(2667/s) q: 1
Block-Dev : R-IOs R-merg R-sect R-wait W-IOs W-merg W-sect W-wait in-fli activ T-wait
/mmcblk0/mmcblk0p45/stat : 5560 468 760088 11033 3046 2587 60120 5490 0 6840 16453
Bug:
62319771
Test: adb bugreport and check the result
Change-Id: I9464c4758f03479d433bdb7a907dd4953f226e1e
Roshan Pius [Tue, 13 Jun 2017 04:27:04 +0000 (04:27 +0000)]
Merge "dumpstate: Remove wpa_cli usage" into oc-dr1-dev am:
516e0c3738
am:
aaf93208bf
Change-Id: Ibfecc35fb6d79028d734b473420553c9a51a83b9
Roshan Pius [Tue, 13 Jun 2017 04:24:04 +0000 (04:24 +0000)]
Merge "dumpstate: Remove wpa_cli usage" into oc-dr1-dev
am:
516e0c3738
Change-Id: I7b51227046dd3af58d0b7008f4a3a49d72ad69d5
TreeHugger Robot [Tue, 13 Jun 2017 04:18:19 +0000 (04:18 +0000)]
Merge "dumpstate: Remove wpa_cli usage" into oc-dr1-dev
Alex Sakhartchouk [Mon, 12 Jun 2017 20:54:36 +0000 (20:54 +0000)]
Merge "Re-enable default display when switching to VR mode." into oc-dr1-dev am:
efa87ca42e
am:
3b2c4d541c
Change-Id: Iaae16cb9f6c49c18ae0c739665c5e5b02bacdf99
Alex Sakhartchouk [Mon, 12 Jun 2017 20:54:28 +0000 (20:54 +0000)]
Merge "Add LambdaMessage to SurfaceFlinger" into oc-dr1-dev am:
2f7af47f12
am:
9c266135c5
Change-Id: I02604352aec1c070981816c419879f4f231e9cbd
Alex Sakhartchouk [Mon, 12 Jun 2017 20:52:40 +0000 (20:52 +0000)]
Merge "Re-enable default display when switching to VR mode." into oc-dr1-dev
am:
efa87ca42e
Change-Id: I149f9ea222d058b6b42405dabd2d27f44706a853
Alex Sakhartchouk [Mon, 12 Jun 2017 20:52:29 +0000 (20:52 +0000)]
Merge "Add LambdaMessage to SurfaceFlinger" into oc-dr1-dev
am:
2f7af47f12
Change-Id: I9dcff900087c79debfd52e2462745e5312c58946
TreeHugger Robot [Mon, 12 Jun 2017 20:44:34 +0000 (20:44 +0000)]
Merge "Re-enable default display when switching to VR mode." into oc-dr1-dev
TreeHugger Robot [Mon, 12 Jun 2017 20:44:34 +0000 (20:44 +0000)]
Merge "Add LambdaMessage to SurfaceFlinger" into oc-dr1-dev
TreeHugger Robot [Mon, 12 Jun 2017 19:28:46 +0000 (19:28 +0000)]
Merge "libudx: Move ServiceDispatcher from libpdx_uds to libpdx"
Wei Wang [Mon, 12 Jun 2017 09:23:54 +0000 (09:23 +0000)]
dumpstate: Dump all block device stat am:
509bb5d176
am:
e7842d53e1
Change-Id: I812a39157cbeede11b6bc33e17c93127443a36af
Wei Wang [Mon, 12 Jun 2017 09:20:10 +0000 (09:20 +0000)]
dumpstate: Dump all block device stat
am:
509bb5d176
Change-Id: I3ddf083f033b093e9304c8cf61e0f5b0ddb47a06
Wei Wang [Fri, 9 Jun 2017 21:42:12 +0000 (14:42 -0700)]
dumpstate: Dump all block device stat
We have "UPTIME MMC PERF" but it is limited to MMC and thus has
been broken for a while in recent devices.
This CL is to add dump for all block devices stat information.
Bug:
62319771
Test: adb bugreport and check the result
Change-Id: I74e0bf0c4bf40e268dffd0abb8922f0ffb5e9692
Alex Vakulenko [Fri, 9 Jun 2017 23:29:04 +0000 (16:29 -0700)]
libudx: Move ServiceDispatcher from libpdx_uds to libpdx
The two separate implementations of ServiceDispatcher for UDS and ServiceFS
are practically identical. Moved the implementation into the base libpdx lib,
and removed the transport-specific versions.
Bug: None
Test: `m -j32` succeeds; pdx_tests, pdx_servicefs_tests, pdx_uds_tests pass
Change-Id: I2344f4f23bc3da27eb7b192344844b87660e8610
Corey Tabaka [Fri, 9 Jun 2017 23:14:37 +0000 (23:14 +0000)]
Merge "Move global buffer ops to VR display service." into oc-dr1-dev am:
6c7f1196ea
am:
8ce5306e88
Change-Id: If7410530cbc30dc126015475954283268eb87381
Corey Tabaka [Fri, 9 Jun 2017 22:29:39 +0000 (22:29 +0000)]
Merge "Move global buffer ops to VR display service." into oc-dr1-dev
am:
6c7f1196ea
Change-Id: I7d08e724cfebcb70e5d5ca23b576d2a878b604e3
TreeHugger Robot [Fri, 9 Jun 2017 21:56:52 +0000 (21:56 +0000)]
Merge "Move global buffer ops to VR display service." into oc-dr1-dev
Mathias Agopian [Fri, 9 Jun 2017 20:13:19 +0000 (20:13 +0000)]
Merge "Add missing VNDK pixel formats to AHardwareBuffer" into oc-dev am:
2563c0f3b0 am:
f86cfd6dd9
am:
7eb30bde4c
Change-Id: I645224f36716462a8fbb6cd91bbe8389459209f8
Mathias Agopian [Fri, 9 Jun 2017 20:12:56 +0000 (20:12 +0000)]
Merge "Add missing VNDK pixel formats to AHardwareBuffer" into oc-dev am:
2563c0f3b0 am:
b52ddcb252
am:
c0828d1e13
Change-Id: I505b7ecfd4acb76f4e117948e13478a3217f41e8
Mathias Agopian [Fri, 9 Jun 2017 19:49:24 +0000 (19:49 +0000)]
Merge "Add missing VNDK pixel formats to AHardwareBuffer" into oc-dev am:
2563c0f3b0
am:
f86cfd6dd9
Change-Id: I7a4e930b62e9cdffa22a66b09509b0927a05beeb
Mathias Agopian [Fri, 9 Jun 2017 19:40:38 +0000 (19:40 +0000)]
Merge "Add missing VNDK pixel formats to AHardwareBuffer" into oc-dev am:
2563c0f3b0
am:
b52ddcb252
Change-Id: I29100f8c59a63036606523991fb0bd03a1d32329
Mathias Agopian [Fri, 9 Jun 2017 19:39:25 +0000 (19:39 +0000)]
Merge "Add missing VNDK pixel formats to AHardwareBuffer" into oc-dev
am:
2563c0f3b0
Change-Id: Iba3dfbfcbaa778da25de68a16beee024ac1b6efe
Mathias Agopian [Fri, 9 Jun 2017 19:36:27 +0000 (19:36 +0000)]
Merge "Add missing VNDK pixel formats to AHardwareBuffer" into oc-dev
am:
2563c0f3b0
Change-Id: I10e623eebb70da1f4127c0eec2aa85867da0623c
Mathias Agopian [Fri, 9 Jun 2017 19:02:45 +0000 (19:02 +0000)]
Merge "Add missing VNDK pixel formats to AHardwareBuffer" into oc-dev
Okan Arikan [Fri, 9 Jun 2017 16:57:12 +0000 (16:57 +0000)]
Merge "Floor height API changes." into oc-dr1-dev am:
2717eaba05
am:
65b2b5dcfb
Change-Id: Ic99fee0ca1cd279aaff882eb1e414dc27a758987
Okan Arikan [Fri, 9 Jun 2017 16:54:44 +0000 (16:54 +0000)]
Merge "Floor height API changes." into oc-dr1-dev
am:
2717eaba05
Change-Id: Id5783b9713cda9a5b1c62499a29322af3e86630c
Okan Arikan [Fri, 9 Jun 2017 16:48:47 +0000 (16:48 +0000)]
Merge "Floor height API changes." into oc-dr1-dev
Alex Sakhartchouk [Mon, 5 Jun 2017 14:37:57 +0000 (10:37 -0400)]
Re-enable default display when switching to VR mode.
Previously, in an attempt to minimize the number of changes that got
reset during VR mode transitions, the primary display was not turned back
on.
Bug:
62215749
Test: Switch device into VR mode, observe primary display invalidations.
Change-Id: Idd883e1522f519a0db06fdd88b071007487b6e70
(cherry picked from commit
933ed5ceb9d70829333ae438985a1bfeec8e79a8)
Alex Sakhartchouk [Wed, 7 Jun 2017 15:36:32 +0000 (11:36 -0400)]
Add LambdaMessage to SurfaceFlinger
LambdaMessage allows for a cleaner, more compact way to create and
dispatch messages inside SurfaceFlinger. A follow up CL uses this
method, but it was isolated here to keep added functionality and
helper facilities separate.
Bug:
62215749
Test: Compile
Change-Id: I9e13e04f1b67fd60f01bcab02fe4f19c91c10bd4
(cherry picked from commit
117698b8e51c839e4c3925d66af13f3de3b420ab)
Jorim Jaggi [Fri, 9 Jun 2017 08:05:12 +0000 (08:05 +0000)]
Merge "Fix build am:
aaef0983ba am:
2c410e0d5f" into oc-dr1-dev-plus-aosp
am:
44a70e99b0
Change-Id: Ibe06c7ec7cff574b5ffb03c73d13401644e9ff4f
Jorim Jaggi [Fri, 9 Jun 2017 08:04:47 +0000 (08:04 +0000)]
Fix build am:
aaef0983ba am:
5a556bc71e
am:
025d6efd95
Change-Id: I523da99a804e27c6ab4a35aecfb3c3a820ebd45d
Android Build Merger (Role) [Fri, 9 Jun 2017 08:02:23 +0000 (08:02 +0000)]
Merge "Fix build am:
aaef0983ba am:
2c410e0d5f" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Fri, 9 Jun 2017 08:02:05 +0000 (08:02 +0000)]
Fix build am:
aaef0983ba
am:
2c410e0d5f
Change-Id: I10728186af370d9e47196eeda43dfeccc582bc74
Jorim Jaggi [Fri, 9 Jun 2017 08:02:04 +0000 (08:02 +0000)]
Fix build am:
aaef0983ba
am:
5a556bc71e
Change-Id: I59426f537ebe484b865a3b424e7e56608fa14112
Jorim Jaggi [Fri, 9 Jun 2017 07:59:34 +0000 (07:59 +0000)]
Fix build
am:
aaef0983ba
Change-Id: I087952f069da1ba624bef32d1ac913a242533321
Jorim Jaggi [Fri, 9 Jun 2017 07:59:34 +0000 (07:59 +0000)]
Fix build
am:
aaef0983ba
Change-Id: Ia4d360cb942c43180d6077cd01bd9e9eb5b598d5
Jorim Jaggi [Fri, 9 Jun 2017 06:55:29 +0000 (23:55 -0700)]
Fix build
Test: builds
Bug:
36631902
Change-Id: Iec23f8ab2b16c923f07d1857aa3471cfefc057dd
TreeHugger Robot [Fri, 9 Jun 2017 05:12:43 +0000 (05:12 +0000)]
Merge changes Idd883e15,I9e13e04f
* changes:
Re-enable default display when switching to VR mode.
Add LambdaMessage to SurfaceFlinger
Jorim Jaggi [Fri, 9 Jun 2017 04:36:14 +0000 (04:36 +0000)]
Properly run window animations at vsync-sf (2/2) am:
b1e2f8deb3 am:
5d37ae59e0
am:
879089b3e8
Change-Id: I5707fe2dba930c4a92b39c2b0fe67033d862d80f
Jorim Jaggi [Fri, 9 Jun 2017 04:33:25 +0000 (04:33 +0000)]
Properly run window animations at vsync-sf (2/2) am:
b1e2f8deb3 am:
d5ebce91c8
am:
a151804acb
Change-Id: I7d68092293a25e0e90a8b9ab87950959f9d12ca3
Jorim Jaggi [Fri, 9 Jun 2017 04:27:03 +0000 (04:27 +0000)]
Properly run window animations at vsync-sf (2/2) am:
b1e2f8deb3
am:
5d37ae59e0
Change-Id: I286fbd09c2fe425a90fd2b93c4a83b03d55e8113
Jorim Jaggi [Fri, 9 Jun 2017 04:24:54 +0000 (04:24 +0000)]
Properly run window animations at vsync-sf (2/2) am:
b1e2f8deb3
am:
d5ebce91c8
Change-Id: I30768aba500834a157290871b0970f20a8eebd06