OSDN Git Service
Jiwen 'Steve' Cai [Fri, 12 May 2017 09:06:08 +0000 (09:06 +0000)]
Merge "BufferHubQueue Cleanup" into oc-dev am:
bb5767763a
am:
2556995957 -s ours
Change-Id: I111dd0e3c3846986ee731c0e228190f425ada357
Gaurav Shah [Fri, 12 May 2017 09:05:30 +0000 (09:05 +0000)]
Merge "Remove libbufferhub mocks/" into oc-dev am:
68d36a3cbb
am:
7adb6b418f
Change-Id: If4ccf55048a0269871acf0c52777094aa4a5e87e
Jiwen 'Steve' Cai [Fri, 12 May 2017 06:55:03 +0000 (06:55 +0000)]
Merge "BufferHubQueue Cleanup" into oc-dev
am:
bb5767763a
Change-Id: I44b9156d5cbb23a26ebe57744e5a524d5dc93ea8
Gaurav Shah [Fri, 12 May 2017 06:54:34 +0000 (06:54 +0000)]
Merge "Remove libbufferhub mocks/" into oc-dev
am:
68d36a3cbb
Change-Id: I3ddb77ea60fd8743830410efeddee19cbdf4b466
TreeHugger Robot [Fri, 12 May 2017 02:56:52 +0000 (02:56 +0000)]
Merge "BufferHubQueue Cleanup" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 02:12:45 +0000 (02:12 +0000)]
Merge "configstore: should import ISurfaceFlingerConfigs"
TreeHugger Robot [Fri, 12 May 2017 01:24:01 +0000 (01:24 +0000)]
Merge "Add ability to pass device metrics to GVR"
Steven Thomas [Fri, 12 May 2017 01:23:55 +0000 (01:23 +0000)]
Merge "Remove graphics.cpp and friends"
Jiwen 'Steve' Cai [Mon, 8 May 2017 23:15:35 +0000 (16:15 -0700)]
BufferHubQueue Cleanup
1/ Add support for NATIVE_WINDOW_CONSUMER_IS_PROTECTED
2/ Remove BufferHubQueueConsumer as we don't need it after all
3/ Merge BufferHubQueueCore into BufferHubQueueProducer
4/ Remove redundant |onAsBinder|
Bug:
38137120
Test: buffer_hub_queue-test and buffer_hub_queue_producer-test
Merged-In: I32bc040f4ce9c6dc9e4382a589fea241870eeb2d
Change-Id: I10f7780f0172b031cc2acecae436bd1ccde65824
TreeHugger Robot [Fri, 12 May 2017 00:59:40 +0000 (00:59 +0000)]
Merge "BufferHubQueue Cleanup"
TreeHugger Robot [Thu, 11 May 2017 23:57:39 +0000 (23:57 +0000)]
Merge "surfaceflinger: Set correct initial value for mActiveColorMode"
Hendrik Wagenaar [Tue, 9 May 2017 23:34:23 +0000 (16:34 -0700)]
Add ability to pass device metrics to GVR
* Passes config file data for the device to VrCore
Bug:
36215727
Test: DvrDisplayManagerTest::ConfigurationData - on marlin, SELinux on,
with and without setenforce.
Change-Id: Iee05b90a21937ed9b60658c70da87a8c99dfcbb2
Hendrik Wagenaar [Tue, 9 May 2017 15:59:51 +0000 (08:59 -0700)]
Remove graphics.cpp and friends
* Delete a bunch of code that isn't used in the O2 path
Bug:
36776792
Test: Compiled
Change-Id: I4adf6ec5678a53e0850229f9dda60e8687793376
Jiwen 'Steve' Cai [Mon, 8 May 2017 23:15:35 +0000 (16:15 -0700)]
BufferHubQueue Cleanup
1/ Add support for NATIVE_WINDOW_CONSUMER_IS_PROTECTED
2/ Remove BufferHubQueueConsumer as we don't need it after all
3/ Merge BufferHubQueueCore into BufferHubQueueProducer
4/ Remove redundant |onAsBinder|
Bug:
38137120
Test: buffer_hub_queue-test and buffer_hub_queue_producer-test
Change-Id: I32bc040f4ce9c6dc9e4382a589fea241870eeb2d
TreeHugger Robot [Thu, 11 May 2017 21:52:51 +0000 (21:52 +0000)]
Merge "SF: Add systrace lines for layer transactions"
TreeHugger Robot [Thu, 11 May 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Remove libbufferhub mocks/" into oc-dev
Martijn Coenen [Thu, 11 May 2017 21:06:15 +0000 (21:06 +0000)]
Merge "Only spawn one binder thread for cmd." into oc-dev am:
31d8ab2e7c
am:
e19f2930c7
Change-Id: I7945d151fd477c4485265740ec357dba1bd8b382
TreeHugger Robot [Thu, 11 May 2017 21:00:51 +0000 (21:00 +0000)]
Merge "libgui: Add frame number and clean up BQ dump"
Martijn Coenen [Thu, 11 May 2017 20:17:03 +0000 (20:17 +0000)]
Merge "Only spawn one binder thread for cmd." into oc-dev
am:
31d8ab2e7c
Change-Id: I2cc1e090bb1669bc7ed181c5e3ae65d5b35f77e5
Martijn Coenen [Thu, 11 May 2017 19:48:37 +0000 (19:48 +0000)]
Merge "Only spawn one binder thread for cmd." into oc-dev
Gaurav Shah [Thu, 11 May 2017 18:57:46 +0000 (11:57 -0700)]
Remove libbufferhub mocks/
It is not used anywhere.
Bug:
36040117
Test: built. no code changes, only dead code removal.
Change-Id: Ia9c52379ac2dabf0179f92c0c2d5ffd4ff92d357
Alex Vakulenko [Thu, 11 May 2017 19:07:36 +0000 (19:07 +0000)]
Merge "Apply correct SELinux labels to PDX endpoint and channel sockets." into oc-dev am:
252e52aa06
am:
49cab39004
Change-Id: I768a073af0061e0608cc499192a47ff93f22278c
Alex Vakulenko [Thu, 11 May 2017 18:33:22 +0000 (18:33 +0000)]
Merge "Apply correct SELinux labels to PDX endpoint and channel sockets." into oc-dev
am:
252e52aa06
Change-Id: Ibaee77dd4f644e3d262719f1188481041293c457
TreeHugger Robot [Thu, 11 May 2017 18:26:46 +0000 (18:26 +0000)]
Merge "Apply correct SELinux labels to PDX endpoint and channel sockets." into oc-dev
Steven Thomas [Thu, 11 May 2017 18:21:58 +0000 (18:21 +0000)]
Merge "Make libdvr a shared library" into oc-dev am:
1ca4674b72
am:
e34b516a4b
Change-Id: I529acf1c880d07879458750e644cb5b1711d8742
Steven Thomas [Thu, 11 May 2017 18:05:32 +0000 (18:05 +0000)]
Merge "Make libdvr a shared library" into oc-dev
am:
1ca4674b72
Change-Id: I4257eb8f7e0b3492b606fb4a96eeeeef2f76627c
Martijn Coenen [Thu, 11 May 2017 16:45:59 +0000 (09:45 -0700)]
Only spawn one binder thread for cmd.
To work around race conditions in libbinder when
spawning new threads while being shut down.
Bug:
36066697
Test: cmd still works
Change-Id: I71c8d1aac29a1bf65d54023a4ed39d943ad54c98
Steven Thomas [Thu, 11 May 2017 17:16:45 +0000 (17:16 +0000)]
Merge "Make libdvr a shared library" into oc-dev
Naseer Ahmed [Thu, 11 May 2017 15:15:21 +0000 (11:15 -0400)]
surfaceflinger: Set correct initial value for mActiveColorMode
HWC always initializes with the native mode, setting
mActiveColorMode to sRGB here without actually calling
setColorMode on HWC will cause framework to think that it is in
sRGB mode already, when the mode has not been set yet.
Bug:
38207860
Test: Compile and boot
Change-Id: I492c07ce542f5a448ff4c7d2f18e72629fc6cd78
Mathieu Chartier [Thu, 11 May 2017 16:43:04 +0000 (16:43 +0000)]
Merge "Add copy system profile functionality"
Nicolas Geoffray [Thu, 11 May 2017 12:46:18 +0000 (12:46 +0000)]
Remove obsolete DEXOPT_SAFEMODE. am:
2520d44e66
am:
c0d105badb
Change-Id: Iddc80fb268703a59931edd247ee419f5b9ee14b8
Nicolas Geoffray [Thu, 11 May 2017 12:11:21 +0000 (12:11 +0000)]
Remove obsolete DEXOPT_SAFEMODE.
am:
2520d44e66
Change-Id: I2f053a09a4eeb48bcee07bb0c9509709bb8dc50f
Nicolas Geoffray [Thu, 11 May 2017 11:33:08 +0000 (11:33 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE." am:
4fa2b96d21 am:
d1058fb90c am:
422eab43cc
am:
3a6114f230
Change-Id: If3bce2d3050ffc472ff0df43d64670244eb7ee5e
Nicolas Geoffray [Thu, 11 May 2017 10:45:14 +0000 (10:45 +0000)]
Merge "Handle safe mode in PackageManager." into oc-dev am:
89726a1dea
am:
336fa83445
Change-Id: I158517bd402108767c64e0e0f5fb342aee6d4e61
Santos Cordon [Thu, 11 May 2017 10:44:30 +0000 (10:44 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (2/2)" into oc-dev am:
02207005fa -s ours
am:
3f4a2889d5 -s ours
Change-Id: I7b33541ec12d134c94b9792cdd8caa969370b4be
Michael Wachenschwanz [Thu, 11 May 2017 10:44:05 +0000 (10:44 +0000)]
Merge "Logging for catching memory issue in Parcel" into oc-dev am:
c8ddb0171f
am:
3710e3d7a0
Change-Id: I52399ddc0a5915c249998a93f5a59deeadf7eae5
Albert Chaulk [Thu, 11 May 2017 10:43:38 +0000 (10:43 +0000)]
Merge "Surfaceflinger: Propagate type & UID from parent layers" into oc-dev am:
4ba6f99070
am:
a6e1c5dc27
Change-Id: I9ae7c566818a0eed0b23d45b3c30fc0154337f2a
Alex Vakulenko [Thu, 11 May 2017 10:43:14 +0000 (10:43 +0000)]
Merge "Revert "atrace: Poke PDX services using utility class."" into oc-dev am:
17cc37dc15
am:
c6e9b955f4
Change-Id: I2578fc68350df843566312c93c03636e9d8a36de
Quddus Chong [Thu, 11 May 2017 10:42:50 +0000 (10:42 +0000)]
Merge "docs: Fixed comments to generate API refs correctly. Test: Verified by manually generating the API refs." into oc-dev am:
a68ae7232b
am:
a9824fa5f7
Change-Id: I5914d9978afcd7dc5c0bf367a23cab06b3042184
Dan Stoza [Thu, 11 May 2017 10:42:25 +0000 (10:42 +0000)]
Merge "SF: Use last call time to rate limit resyncs" into oc-dev am:
2e252c93ac
am:
60954518c3
Change-Id: Ic03549017c29b05cae9363483b3e980723a3817d
Andreas Gampe [Thu, 11 May 2017 10:42:01 +0000 (10:42 +0000)]
Merge "Otapreopt: Work around bug
38186355" into oc-dev am:
4c8cc1c86a
am:
0bcb8e9326
Change-Id: I00677ec99337440037be6467486564213714bce5
Michael Wright [Thu, 11 May 2017 10:41:38 +0000 (10:41 +0000)]
Merge "Correct PowerManager transaction IDs." into oc-dev am:
5aab417693
am:
0896079677
Change-Id: I7d3d064a08c64202b49d5b12bd864291dc84a8ba
Yifan Hong [Thu, 11 May 2017 10:41:13 +0000 (10:41 +0000)]
Merge "lshal: remove "// static" comments" am:
8d2f788a05 am:
7d6944d40a am:
45bf90c166
am:
4691e74a61
Change-Id: Id358fb18b0b2044fd73850b1375c6c5fb34b3a4f
Yi Kong [Thu, 11 May 2017 10:40:43 +0000 (10:40 +0000)]
Merge "Add explicit default copy constructor" am:
c9810011e9 am:
3bf99597b4 am:
992fa650be
am:
e383f04422
Change-Id: Id2eb933840e2a2c8c898474a5e5f2101e9d2dfd3
Nicolas Geoffray [Thu, 11 May 2017 10:01:07 +0000 (10:01 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE." am:
4fa2b96d21 am:
d1058fb90c
am:
422eab43cc
Change-Id: I5547f465814d5cd3dca05e0a4c8e0f2473febc75
Nicolas Geoffray [Thu, 11 May 2017 09:59:07 +0000 (09:59 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE." am:
4fa2b96d21
am:
d1058fb90c
Change-Id: Ic9dd064d8eb66f1dd99302c0cfed83a5e4ca2233
Nicolas Geoffray [Thu, 11 May 2017 09:50:31 +0000 (09:50 +0000)]
Merge "Handle safe mode in PackageManager." into oc-dev
am:
89726a1dea
Change-Id: I71dc793457b9f04d91d1863e2a33c70936c63ebd
Nicolas Geoffray [Thu, 11 May 2017 09:48:59 +0000 (09:48 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE."
am:
4fa2b96d21
Change-Id: I652a433fb0e042b79e4289faf74b8b4c6cd84f91
Nicolas Geoffray [Fri, 5 May 2017 13:32:51 +0000 (14:32 +0100)]
Remove obsolete DEXOPT_SAFEMODE.
installd side of the change.
bug:
37929796
Test: build
Change-Id: I358c0784a7b563cbd6ceaecdb80710971f483d02
(cherry picked from commit
bad623a225d0b3d94f30f8654bd4684969e90d4c)
Nicolas Geoffray [Thu, 11 May 2017 09:43:44 +0000 (09:43 +0000)]
Merge "Handle safe mode in PackageManager." into oc-dev
Nicolas Geoffray [Thu, 11 May 2017 09:42:23 +0000 (09:42 +0000)]
Merge "Remove obsolete DEXOPT_SAFEMODE."
Santos Cordon [Thu, 11 May 2017 05:37:41 +0000 (05:37 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (2/2)" into oc-dev
am:
02207005fa -s ours
Change-Id: I94e6f135f5e49d1514354ae326075ea4bca496f3
Michael Wachenschwanz [Thu, 11 May 2017 05:37:19 +0000 (05:37 +0000)]
Merge "Logging for catching memory issue in Parcel" into oc-dev
am:
c8ddb0171f
Change-Id: Ifc85054fa35bfc89722c8b37337b2d540164d122
Albert Chaulk [Thu, 11 May 2017 05:36:52 +0000 (05:36 +0000)]
Merge "Surfaceflinger: Propagate type & UID from parent layers" into oc-dev
am:
4ba6f99070
Change-Id: Iefbb9bd3c578fe8d8662f7d35422f6f20b8110a1
TreeHugger Robot [Thu, 11 May 2017 05:16:51 +0000 (05:16 +0000)]
Merge "GraphicsEnv is separated from libui"
TreeHugger Robot [Thu, 11 May 2017 03:53:36 +0000 (03:53 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (2/2)" into oc-dev
Mathias Agopian [Thu, 11 May 2017 03:10:11 +0000 (03:10 +0000)]
Merge "fix circular dependency libnativewindow <-> libui"
Santos Cordon [Thu, 11 May 2017 02:13:17 +0000 (02:13 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (2/2)" into oc-dev-plus-aosp
am:
fe0c36fea7
Change-Id: I8ea0972361a2fbb571781b51e4d181b748502e55
Santos Cordon [Wed, 5 Apr 2017 17:37:00 +0000 (10:37 -0700)]
Add uniqueId to Virtual Display and pass through to inputflinger (2/2)
This CL adds:
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.
Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input". Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Bug:
36051620
Change-Id: I662f09f863a3dc94c570e7e7f30b83888b3f514c
Merged-In: I662f09f863a3dc94c570e7e7f30b83888b3f514c
Santos Cordon [Thu, 11 May 2017 01:48:18 +0000 (01:48 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (2/2)"
Mathieu Chartier [Wed, 10 May 2017 19:48:37 +0000 (12:48 -0700)]
Add copy system profile functionality
Test: Flash preopted speed-profile maps.
Test: Confirm ref profile exists.
Test: Close maps, recompile with speed-profile, test the profile was used.
Test: Launch maps, do some stuff until cur profile exists.
Test: Re-compile with speed-profile and confirm cur merged over ref correctly.
Bug:
38032017
Change-Id: I19c8009ad61213bdcb52f010329eb459ca82f92b
Michael Wachenschwanz [Thu, 11 May 2017 01:24:21 +0000 (01:24 +0000)]
Merge "Logging for catching memory issue in Parcel" into oc-dev
Jaesoo Lee [Tue, 2 May 2017 13:19:39 +0000 (22:19 +0900)]
configstore: should import ISurfaceFlingerConfigs
This changes fixes a build error.
Bug:
37727469
Test: Built and tested on Sailfish
Change-Id: I9c8be953f906af3b541a437e8f445063a518bf29
TreeHugger Robot [Thu, 11 May 2017 01:03:27 +0000 (01:03 +0000)]
Merge "Surfaceflinger: Propagate type & UID from parent layers" into oc-dev
Mathias Agopian [Thu, 11 May 2017 01:00:31 +0000 (18:00 -0700)]
fix circular dependency libnativewindow <-> libui
Bug:
37647680
Bug:
37648355
Test: compile, manual
Change-Id: Ib13fe0ad32d6b4ebfc726003ffb65cb5887e24f9
Alex Vakulenko [Thu, 11 May 2017 00:51:51 +0000 (00:51 +0000)]
Merge "Revert "atrace: Poke PDX services using utility class."" into oc-dev
am:
17cc37dc15
Change-Id: Ic31751da5e2699c9a9e11fd0df716847c0685d7e
Quddus Chong [Thu, 11 May 2017 00:51:31 +0000 (00:51 +0000)]
Merge "docs: Fixed comments to generate API refs correctly. Test: Verified by manually generating the API refs." into oc-dev
am:
a68ae7232b
Change-Id: I15968454d899a4c3f676527b9724b6fbb49fc0bd
Dan Stoza [Thu, 11 May 2017 00:51:10 +0000 (00:51 +0000)]
Merge "SF: Use last call time to rate limit resyncs" into oc-dev
am:
2e252c93ac
Change-Id: Id9ecf8b6aeb8ce3b084c1aa21096a0dc03e3fb7c
Andreas Gampe [Thu, 11 May 2017 00:50:49 +0000 (00:50 +0000)]
Merge "Otapreopt: Work around bug
38186355" into oc-dev
am:
4c8cc1c86a
Change-Id: Ic8b695f766165402fd2f66f54efcf30b76b498fe
Michael Wright [Thu, 11 May 2017 00:50:28 +0000 (00:50 +0000)]
Merge "Correct PowerManager transaction IDs." into oc-dev
am:
5aab417693
Change-Id: I0c9897e77cbd35991dae21aaec06466f8c071316
Yifan Hong [Thu, 11 May 2017 00:38:25 +0000 (00:38 +0000)]
Merge "lshal: remove "// static" comments" am:
8d2f788a05 am:
7d6944d40a
am:
45bf90c166
Change-Id: I3fd98e82715890ed1a83862dfe369a15b316c3ad
Yifan Hong [Thu, 11 May 2017 00:34:24 +0000 (00:34 +0000)]
Merge "lshal: remove "// static" comments" am:
8d2f788a05
am:
7d6944d40a
Change-Id: I36367aa4f5bd756d31855186066cd2e930e32414
Yifan Hong [Thu, 11 May 2017 00:30:23 +0000 (00:30 +0000)]
Merge "lshal: remove "// static" comments"
am:
8d2f788a05
Change-Id: Id2eacee2cd265922954cc3b480015c6fe9efa6d1
Yifan Hong [Thu, 11 May 2017 00:23:58 +0000 (00:23 +0000)]
Merge "lshal: remove "// static" comments"
Yi Kong [Thu, 11 May 2017 00:22:42 +0000 (00:22 +0000)]
Merge "Add explicit default copy constructor" am:
c9810011e9 am:
3bf99597b4
am:
992fa650be
Change-Id: I536ae9a50f5b263c1a60011fdbc1bba269096d1e
Yi Kong [Thu, 11 May 2017 00:04:39 +0000 (00:04 +0000)]
Merge "Add explicit default copy constructor" am:
c9810011e9
am:
3bf99597b4
Change-Id: I1866cb30496b1ad3d49171e1b2b44dcfe44575a3
Steven Thomas [Mon, 8 May 2017 22:45:30 +0000 (15:45 -0700)]
Make libdvr a shared library
Make libdvr a shared library so it can be loaded by the vr platform
library and accessed externally.
Bug:
38134403
Test: Booted a Marlin.
Change-Id: I9914188c80a9a41902fc4000a4f78f877e5e5695
Yi Kong [Wed, 10 May 2017 23:53:19 +0000 (23:53 +0000)]
Merge "Add explicit default copy constructor"
am:
c9810011e9
Change-Id: I4d6198e65c54f3f620c031da3d9fa395d6d3762f
Treehugger Robot [Wed, 10 May 2017 23:35:33 +0000 (23:35 +0000)]
Merge "Add explicit default copy constructor"
Alex Klyubin [Wed, 10 May 2017 23:32:26 +0000 (23:32 +0000)]
Merge "Switch from libcrypto_static to libcrypto target" am:
612c12b293 am:
4c246fe5df am:
25eacb0b5e -s ours
am:
6a137e087f
Change-Id: I06a612f700d65f1b3f357be21e17bb8f973f9e4f
Steven Moreland [Tue, 9 May 2017 23:43:46 +0000 (16:43 -0700)]
lshal: remove "// static" comments
Test: pass
Change-Id: I4d710c8aaad87cfcd7896800a5ab24f812775703
Albert Chaulk [Thu, 4 May 2017 20:59:44 +0000 (16:59 -0400)]
Surfaceflinger: Propagate type & UID from parent layers
Bug:
36589137
Test: Launch chrome in VR (surfaceview has a parent)
Change-Id: I9320a8df249d1d5790323b22f0ba88a792f9468f
Dan Stoza [Wed, 10 May 2017 22:11:11 +0000 (15:11 -0700)]
SF: Add systrace lines for layer transactions
Adds new lines to systrace corresponding to when Layers have
transactions (including showing how many transactions are pending when
deferred transactions are used). The new lines are prefixed with "TX - "
to distinguish them from the usual queue occupancy lines.
Test: Manual inspection of systraces
Change-Id: Iebc165a187cf87b6bc1ed4de6595463f5ba9d4fe
Yi Kong [Wed, 10 May 2017 21:27:39 +0000 (14:27 -0700)]
Add explicit default copy constructor
Definition of implicit copy constructor is deprecated if it has a
user-declared destructor. This triggers -Wdeprecated compiler warning
and breaks the build in latest Clang update.
Test: Build
Bug:
37752547
Change-Id: I467d5ff3b4cca4644c7ec8c99ae35556029ce509
TreeHugger Robot [Wed, 10 May 2017 21:18:46 +0000 (21:18 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (2/2)" into oc-dev-plus-aosp
TreeHugger Robot [Wed, 10 May 2017 20:25:35 +0000 (20:25 +0000)]
Merge "Revert "atrace: Poke PDX services using utility class."" into oc-dev
Alex Klyubin [Wed, 10 May 2017 19:54:42 +0000 (19:54 +0000)]
Merge "Switch from libcrypto_static to libcrypto target" am:
612c12b293 am:
4c246fe5df
am:
25eacb0b5e -s ours
Change-Id: I0142405d334c5615fbc10201716d1d312b3686a9
Quddus Chong [Wed, 10 May 2017 19:52:40 +0000 (19:52 +0000)]
Merge "docs: Fixed comments to generate API refs correctly. Test: Verified by manually generating the API refs." into oc-dev
Alex Klyubin [Wed, 10 May 2017 19:43:11 +0000 (19:43 +0000)]
Merge "Switch from libcrypto_static to libcrypto target" am:
612c12b293
am:
4c246fe5df
Change-Id: I6f49fd3560dc03de06cba7e06e039e98e55d697e
Alex Klyubin [Wed, 10 May 2017 19:40:11 +0000 (19:40 +0000)]
Merge "Switch from libcrypto_static to libcrypto target"
am:
612c12b293
Change-Id: I12980dcc8ea7b809b87199e9d7959202a7abc385
Alex Klyubin [Wed, 10 May 2017 19:25:30 +0000 (19:25 +0000)]
Merge "Switch from libcrypto_static to libcrypto target"
TreeHugger Robot [Wed, 10 May 2017 19:19:59 +0000 (19:19 +0000)]
Merge "SF: Use last call time to rate limit resyncs" into oc-dev
Michael Wachenschwanz [Mon, 8 May 2017 21:26:41 +0000 (14:26 -0700)]
Logging for catching memory issue in Parcel
Added a check to catch a bug that is suspected to lead to a segfault
during GC. Actual fix for the bug is commented and will be checked in
once the flow that is hitting the bug is uncoverered
Bug:
37298089
Test: manual
Change-Id: I68dea02566a9e9375e3a09d4cc19e39379d84747
Signed-off-by: Michael Wachenschwanz <mwachens@google.com>
Alex Vakulenko [Wed, 10 May 2017 18:32:52 +0000 (18:32 +0000)]
Revert "atrace: Poke PDX services using utility class."
This reverts commit
f70680e995d6df4604c9b34f6a5afebe613d7feb.
There appears to be a bug in the current build system that does not
cleanly rebuild all targets using static libraries built across
different build systems (Soong/make). With the recent change to PDX
connection handshake, it is important that all clients and services are
rebuilt to include the new protocol changes. However this is not the
case when doing incremental builds. Some services remain untouched
during global builds and hence there is a disparity in clients' and
services' implementations of the protocol.
atrace being one of the clients is affected (the symptom is that when
started atrace just hangs waiting for connection to a PDX service).
While there is nothing wrong with the current state of code, but the
issue of incomplete incremental builds is causing headaches for people
trying to chase performance issues in O with systrace (since it is
unclear that they need to do a clean build).
Reverting the dependency on PDX in atrace for now until the build system
issue is identified and fixed property. This change can be re-landed then.
Bug:
38201226
Change-Id: Ica0efc38f600295ef6f64b9f9584ac41cb84f424
Santos Cordon [Wed, 5 Apr 2017 17:37:00 +0000 (10:37 -0700)]
Add uniqueId to Virtual Display and pass through to inputflinger (2/2)
This CL adds:
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.
Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input". Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Bug:
36051620
Change-Id: I662f09f863a3dc94c570e7e7f30b83888b3f514c
TreeHugger Robot [Wed, 10 May 2017 17:31:52 +0000 (17:31 +0000)]
Merge "Otapreopt: Work around bug
38186355" into oc-dev
Dan Stoza [Tue, 9 May 2017 19:48:19 +0000 (12:48 -0700)]
libgui: Add frame number and clean up BQ dump
Adds the frame counter and the frame numbers of each buffer in the
BufferQueue to its dumpState. Also cleans up both the formatting of the
dumpState source and its output.
Bug:
38178182
Test: Manual testing with `dumpsys SurfaceFlinger`
Change-Id: Id3869a796e59ab00b26c3eb9cd958a9179bc8b7e
Quddus Chong [Tue, 9 May 2017 21:43:16 +0000 (14:43 -0700)]
docs: Fixed comments to generate API refs correctly.
Test: Verified by manually generating the API refs.
Change-Id: I77f2072d2aa83a6c71e11b216e206c4e6563ab88
Alex Vakulenko [Tue, 2 May 2017 00:54:24 +0000 (17:54 -0700)]
Apply correct SELinux labels to PDX endpoint and channel sockets.
Bug:
37646189
Test: Compiled for sailfish-eng
Device booted, normal 2D UI works as before
Was able to run Daydream app and CubeSea (before O1 VR rendering
path was disabled by recent change in HW composer).
Change-Id: I1f7040324992d3c784f072ea6b64a65fa7ed0589
Nicolas Geoffray [Fri, 5 May 2017 13:32:51 +0000 (14:32 +0100)]
Remove obsolete DEXOPT_SAFEMODE.
installd side of the change.
bug:
37929796
Test: build
(cherry picked from commit
bad623a225d0b3d94f30f8654bd4684969e90d4c)
Change-Id: Ice855d20184443a641e081efa4ec943326ccefdd
OSDN Git Service
