OSDN Git Service
Jesse Hall [Mon, 15 May 2017 14:37:14 +0000 (14:37 +0000)]
Merge "Load updated graphics drivers into sphal-child namespace" into oc-dev am:
6b32bed777
am:
fa374e98d5
Change-Id: I0ec6b35ce64da0faeaf4dd4281f016bd049f7c38
Jesse Hall [Mon, 15 May 2017 14:34:14 +0000 (14:34 +0000)]
Merge "Load updated graphics drivers into sphal-child namespace" into oc-dev
am:
6b32bed777
Change-Id: I9cf1ef5304c97f2b740d66b3790734b40c3037d1
Jesse Hall [Mon, 15 May 2017 14:30:17 +0000 (14:30 +0000)]
Merge "Load updated graphics drivers into sphal-child namespace" into oc-dev
Jiyong Park [Fri, 28 Apr 2017 09:08:36 +0000 (18:08 +0900)]
Mark libui as vendor_available
libui is used by libgui and libstagefright_foundation which are both in
VNDK. So libui should also be in VNDK.
Bug:
37731063
Test: sailfish builds and boots
Test: 'BOARD_VNDK_VERSION=current m libui' successful
Change-Id: Ia8172a42325e5b5181741dda70048dc68e778b76
Yifan Hong [Sat, 13 May 2017 01:40:58 +0000 (01:40 +0000)]
Merge "Actually remove dead processes from lshal" am:
28765c6184 am:
d52b085d44 am:
e69eaddc3e
am:
681af84df2
Change-Id: I9e066dcb2b9a165c2642ea393ad30d323f898c16
Yifan Hong [Sat, 13 May 2017 01:38:51 +0000 (01:38 +0000)]
Merge "Actually remove dead processes from lshal" am:
28765c6184 am:
d52b085d44
am:
e69eaddc3e
Change-Id: I120912d0dd12dec09d531a96111080c6f8a14b92
Yifan Hong [Sat, 13 May 2017 01:36:32 +0000 (01:36 +0000)]
Merge "Actually remove dead processes from lshal" am:
28765c6184
am:
d52b085d44
Change-Id: Ia86f84007a37f5ae158d85bd3fc0f947e5d84c37
Yifan Hong [Sat, 13 May 2017 01:33:34 +0000 (01:33 +0000)]
Merge "Actually remove dead processes from lshal"
am:
28765c6184
Change-Id: I8142135cfc9afe8af63fa00f35cb83ac3a4f1372
Treehugger Robot [Sat, 13 May 2017 01:25:34 +0000 (01:25 +0000)]
Merge "Actually remove dead processes from lshal"
Matthew Bouyack [Sat, 13 May 2017 01:19:37 +0000 (01:19 +0000)]
Fixes vsync behavior in power mode transitions. am:
4de4ee3cb3 am:
c6e23d9959 -s ours am:
035818fac9
am:
d178711933
Change-Id: I7d2d66a5b52820c2a6e6e7df9a4c29ac4ba2e5bc
Matthew Bouyack [Sat, 13 May 2017 01:19:13 +0000 (01:19 +0000)]
Fixes vsync behavior in power mode transitions. am:
4de4ee3cb3 am:
c6e23d9959 am:
e051fd5b88 -s ours
am:
7dd0a27dd4
Change-Id: Ibd79e04ee261f387a50ec702372ec802a4f69fdc
Matthew Bouyack [Sat, 13 May 2017 01:06:04 +0000 (01:06 +0000)]
Fixes vsync behavior in power mode transitions. am:
4de4ee3cb3 am:
c6e23d9959 -s ours
am:
035818fac9
Change-Id: I50d56807c994ea1db287bfe31fc53fc4d74614e7
Matthew Bouyack [Sat, 13 May 2017 01:02:33 +0000 (01:02 +0000)]
Fixes vsync behavior in power mode transitions. am:
4de4ee3cb3
am:
c6e23d9959 -s ours
Change-Id: I08d22529331d4f512935e94fd1c63525bdda6115
Matthew Bouyack [Sat, 13 May 2017 01:02:33 +0000 (01:02 +0000)]
Fixes vsync behavior in power mode transitions. am:
4de4ee3cb3 am:
c6e23d9959
am:
e051fd5b88 -s ours
Change-Id: Ie83a4a41d911d0fb4cfde1dd8cdff6031f6ee238
Matthew Bouyack [Sat, 13 May 2017 00:21:01 +0000 (00:21 +0000)]
Fixes vsync behavior in power mode transitions. am:
4de4ee3cb3
am:
c6e23d9959
Change-Id: I0fba407c14811a81b1ad2926fca5130f8f65638d
Matthew Bouyack [Sat, 13 May 2017 00:18:59 +0000 (00:18 +0000)]
Fixes vsync behavior in power mode transitions.
am:
4de4ee3cb3
Change-Id: I78e718bc1f9098e0da58257587062c11a8bd7e3a
Okan Arikan [Fri, 12 May 2017 23:53:26 +0000 (23:53 +0000)]
Merge "Remove libposepredictor." into oc-dev am:
25d50da373
am:
561e325f83 -s ours
Change-Id: Ie9ec8a3aeb6683c4fdf2324d12646080bd1cee8c
Okan Arikan [Fri, 12 May 2017 23:44:58 +0000 (23:44 +0000)]
Merge "Remove libposepredictor." into oc-dev
am:
25d50da373
Change-Id: I531e519bbdcbdba86028b1f7a77295fae81be6da
TreeHugger Robot [Fri, 12 May 2017 23:37:44 +0000 (23:37 +0000)]
Merge "Remove libposepredictor." into oc-dev
Yifan Hong [Fri, 12 May 2017 23:33:57 +0000 (16:33 -0700)]
Actually remove dead processes from lshal
Test: run lshal with and without the change
Change-Id: Id8c52a5be3253f5ff9c1cb851459a16e01ca5dda
Fixes:
35765788
Yifan Hong [Fri, 12 May 2017 23:05:14 +0000 (23:05 +0000)]
Merge changes from topic 'lshal_debug' am:
d4f5bb4c17 am:
a7f366d411 am:
cb0cb2f04e
am:
50892aed32
Change-Id: I05e1a63fbfbe3c2348cc70f8a98bc6fad90ee5e2
Yifan Hong [Fri, 12 May 2017 22:51:31 +0000 (22:51 +0000)]
Merge changes from topic 'lshal_debug' am:
d4f5bb4c17 am:
a7f366d411
am:
cb0cb2f04e
Change-Id: Ia931ccf63b5a7c6d05616c1137fe90e45dc4d612
Yifan Hong [Fri, 12 May 2017 22:46:09 +0000 (22:46 +0000)]
Merge changes from topic 'lshal_debug' am:
d4f5bb4c17
am:
a7f366d411
Change-Id: Ie7f3af47145cfd581a8484a8c397518c01cdda40
Yifan Hong [Fri, 12 May 2017 22:38:48 +0000 (22:38 +0000)]
Merge changes from topic 'lshal_debug'
am:
d4f5bb4c17
Change-Id: I0d7b068421152d9c2bfb1c53718abcb7e09c26a1
Yifan Hong [Fri, 12 May 2017 22:21:25 +0000 (22:21 +0000)]
Merge changes from topic 'lshal_debug'
* changes:
Add tests to lshal.
Add `lshal debug` command.
Lshal: support commands.
Jesse Hall [Fri, 5 May 2017 23:41:35 +0000 (16:41 -0700)]
Load updated graphics drivers into sphal-child namespace
Bug:
37854032
Test: install driver package, run gles3jni and vulkanGears,
check /proc/<pid>/maps to ensure updated driver is loaded
Change-Id: I45d5be974ad079f8fcdbce6f06ccd3c191ec6a12
TreeHugger Robot [Fri, 12 May 2017 21:31:37 +0000 (21:31 +0000)]
Merge "Remove libposepredictor."
Matthew Bouyack [Fri, 12 May 2017 19:49:32 +0000 (12:49 -0700)]
Fixes vsync behavior in power mode transitions.
Calling EventThread::onScreenAcquired enables hardware vsync and
calling EventThread::onScreenReleased disables hardware vsync.
The power modes 'NORMAL' and 'DOZE' should have hardware vsync
enabled while power modes 'OFF' and 'DOZE_SUSPEND' should have
hardware vsync disabled.
This change correctly handles the transitions from 'OFF' to
'DOZE_SUSPEND' and from either 'OFF' or 'DOZE_SUSPEND' to
'NORMAL'. Previously these cases were handled incorrectly.
Note that redundant calls to onScreenAcquired or onScreenReleased
are safe.
Fixes bug:
38232221
Change-Id: I7b00f97a67b157366364b3d26fe94533da07c263
Chia-I Wu [Fri, 12 May 2017 20:02:34 +0000 (20:02 +0000)]
Merge "Revert "surfaceflinger: work around dumpsys lockup"" into oc-dev am:
acf2c6dd58
am:
6975146c6b
Change-Id: I5a4e7cbf5e86dea17db4b9d8048775bf46f45404
Okan Arikan [Fri, 12 May 2017 16:37:12 +0000 (09:37 -0700)]
Remove libposepredictor.
It is no longer used in this project.
Bug:
38260355
Test: make
Change-Id: I3178c6078186c85fcaf560eb0af603ffc31b5109
Merged-In: I3178c6078186c85fcaf560eb0af603ffc31b5109
Chia-I Wu [Fri, 12 May 2017 19:59:13 +0000 (19:59 +0000)]
Merge "Revert "surfaceflinger: work around dumpsys lockup"" into oc-dev
am:
acf2c6dd58
Change-Id: I0590a73880f00fda0dd3493b410fb0d0832e9485
Chia-I Wu [Fri, 12 May 2017 19:50:55 +0000 (19:50 +0000)]
Merge "Revert "surfaceflinger: work around dumpsys lockup"" into oc-dev
Yifan Hong [Wed, 10 May 2017 21:33:05 +0000 (14:33 -0700)]
Add tests to lshal.
Test: lshal_test
Bug:
37954458
Change-Id: I1914e6274974ed5eb0ce2d655f1333d2344b49f5
Yifan Hong [Wed, 10 May 2017 02:33:08 +0000 (19:33 -0700)]
Add `lshal debug` command.
Supported command:
lshal debug android.hardware.foo@1.0::IFoo option option
Test: adb unroot && lshal --debug ; echo $?
Test: adb unroot && lshal debug android.hardware.nfc@1.0::INfc ; echo $?
Test: adb root && lshal --debug ; echo $?
Test: adb root && lshal debug android.hardware.nfc@1.0::INfc ; echo $?
Bug:
37954458
Change-Id: Ia2f4c9c0d3fb0a7bb26e76f01d02f49dc426e7f8
Yifan Hong [Wed, 10 May 2017 01:49:45 +0000 (18:49 -0700)]
Lshal: support commands.
Support the following commands:
lshal list
lshal list -itrpc
lshal help
lshal help list
lshal list -h
lshal list --help
Test: run these commands
Bug:
37725279
Change-Id: I970fbc8d250d43f57e92f783229e0645d7e8df4e
Okan Arikan [Fri, 12 May 2017 16:37:12 +0000 (09:37 -0700)]
Remove libposepredictor.
It is no longer used in this project.
Bug:
38260355
Test: make
Change-Id: I3178c6078186c85fcaf560eb0af603ffc31b5109
Hendrik Wagenaar [Fri, 12 May 2017 16:26:48 +0000 (16:26 +0000)]
Merge "Remove QCom specific flags" into oc-dev am:
cd43683371
am:
86b4423b58
Change-Id: Ia1251190bb8402279c26fe1c96357dfb103fab0e
Hendrik Wagenaar [Fri, 12 May 2017 16:19:53 +0000 (16:19 +0000)]
Merge "Remove QCom specific flags" into oc-dev
am:
cd43683371
Change-Id: I6abf03a512939f0290ca11d7301b4df015d7b912
TreeHugger Robot [Fri, 12 May 2017 16:06:51 +0000 (16:06 +0000)]
Merge "Remove QCom specific flags" into oc-dev
Chia-I Wu [Thu, 11 May 2017 23:06:07 +0000 (16:06 -0700)]
Revert "surfaceflinger: work around dumpsys lockup"
This reverts commit
843460d1d8ced54ed224cff2b3fad703b6ea98c4.
Bug:
38183197
Test: manual while running dumpDebugInfo continuously in the
background
Change-Id: Ife3fb2970f58b8c8049bbe878c6a7728d1299d57
Jaesoo Lee [Fri, 12 May 2017 12:43:41 +0000 (12:43 +0000)]
configstore: should import ISurfaceFlingerConfigs am:
b2f9ce2d1d
am:
493fde4481 -s ours
Change-Id: I24af99726b2eb2e8ad3d792fcaa4f3355121c0f2
Jaesoo Lee [Fri, 12 May 2017 12:41:40 +0000 (12:41 +0000)]
configstore: should import ISurfaceFlingerConfigs
am:
b2f9ce2d1d
Change-Id: I5b928e6d01ae3185cc695399ed35933aeb20d3c8
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: Icfd71a3b1db6477d53bbbcb0f4b17ac9b588abf9
Merged-In: I9c8be953f906af3b541a437e8f445063a518bf29
Hendrik Wagenaar [Fri, 12 May 2017 09:06:40 +0000 (09:06 +0000)]
Merge "DO NOT MERGE Remove graphics.cpp and friends" into oc-dev am:
c4a3020c4d
am:
121fb5ce33 -s ours
Change-Id: I6d68cbf646907cf997924794367368e46dcb5d5c
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
Hendrik Wagenaar [Fri, 12 May 2017 06:55:25 +0000 (06:55 +0000)]
Merge "DO NOT MERGE Remove graphics.cpp and friends" into oc-dev
am:
c4a3020c4d
Change-Id: I4bc2e9c9cc528e9fe35741516065b5ea46179bfe
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 05:49:00 +0000 (05:49 +0000)]
Merge "DO NOT MERGE Remove graphics.cpp and friends" into oc-dev
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
Hendrik Wagenaar [Tue, 9 May 2017 15:59:51 +0000 (08:59 -0700)]
DO NOT MERGE 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
Merged-In: 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
OSDN Git Service
