OSDN Git Service
Android Build Merger (Role) [Wed, 2 Aug 2017 23:31:46 +0000 (23:31 +0000)]
Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am:
8d753bc3a3 am:
27191ac475" into oc-mr1-dev-plus-aosp
Christine Franks [Wed, 2 Aug 2017 23:29:12 +0000 (23:29 +0000)]
Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am:
8d753bc3a3
am:
27191ac475
Change-Id: I195d9e0f5536ac12ae4622e011fb3a0f0b01d3c3
Android Build Merger (Role) [Wed, 2 Aug 2017 23:28:45 +0000 (23:28 +0000)]
Merge "Merge "services.core: remove use of -static hidl java" into stage-aosp-master am:
e79a0931f7 am:
9bd5b76318 -s ours am:
9dbda410bc -s ours" into oc-mr1-dev-plus-aosp
Steven Moreland [Wed, 2 Aug 2017 23:26:20 +0000 (23:26 +0000)]
Merge "services.core: remove use of -static hidl java" into stage-aosp-master am:
e79a0931f7 am:
9bd5b76318 -s ours
am:
9dbda410bc -s ours
Change-Id: I287db1685c0ff95c8b9516b86014b7d05affb9a5
Android Build Merger (Role) [Wed, 2 Aug 2017 23:25:13 +0000 (23:25 +0000)]
Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am:
46f2cdeb63 am:
21cd29e235" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 2 Aug 2017 23:21:21 +0000 (23:21 +0000)]
Merge "Merge "Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev am:
e81cdeea1c" into oc-mr1-dev am:
17d16ef49b" into oc-mr1-dev-plus-aosp
Adrian Roos [Wed, 2 Aug 2017 23:19:34 +0000 (23:19 +0000)]
Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am:
46f2cdeb63
am:
21cd29e235
Change-Id: I30034a1df51296ae3aa5bc74af65dca415d13873
Adrian Roos [Wed, 2 Aug 2017 23:17:29 +0000 (23:17 +0000)]
Merge "Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev am:
e81cdeea1c" into oc-mr1-dev
am:
17d16ef49b
Change-Id: Id0560024ee57a7d3487eca480fcf5053c544948c
Android Build Merger (Role) [Wed, 2 Aug 2017 23:16:46 +0000 (23:16 +0000)]
Merge "Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am:
65abebbadd" into oc-mr1-dev am:
25cdef21dc" into oc-mr1-dev-plus-aosp
Jeff Sharkey [Wed, 2 Aug 2017 23:14:12 +0000 (23:14 +0000)]
Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am:
65abebbadd" into oc-mr1-dev
am:
25cdef21dc
Change-Id: Ie12c51a826909b5224632bc26a871d984435b18a
Android Build Merger (Role) [Wed, 2 Aug 2017 23:13:43 +0000 (23:13 +0000)]
Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am:
4b6ef9c92d am:
27d9ca08da" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 2 Aug 2017 23:13:27 +0000 (23:13 +0000)]
Merge "Merge "Give DeviceStorageMonitorService it's own thread." into oc-mr1-dev am:
fe268483d0" into oc-mr1-dev-plus-aosp
Jeff Sharkey [Wed, 2 Aug 2017 23:10:34 +0000 (23:10 +0000)]
Merge "Give DeviceStorageMonitorService it's own thread." into oc-mr1-dev
am:
fe268483d0
Change-Id: I490c840fa56354e0a2122e1ff389e433e50087aa
Brad Ebinger [Wed, 2 Aug 2017 23:10:28 +0000 (23:10 +0000)]
Merge "Remove Conferenceable update squelching" into oc-dr1-dev am:
4b6ef9c92d
am:
27d9ca08da
Change-Id: If7609c87ad507f9ec6cd3fd19d779e68c55e6280
Android Build Merger (Role) [Wed, 2 Aug 2017 23:10:09 +0000 (23:10 +0000)]
Merge "Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev am:
ae938cee71 am:
64dd913f68" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 2 Aug 2017 23:06:59 +0000 (23:06 +0000)]
Merge "Merge "Fix keyboard focus in VR" into oc-dr1-dev am:
986995d481 am:
7def2eea97" into oc-mr1-dev-plus-aosp
Evan Rosky [Wed, 2 Aug 2017 23:06:40 +0000 (23:06 +0000)]
Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev am:
ae938cee71
am:
64dd913f68
Change-Id: Idd3ad3c47651b229e9b1642cee03af2288458712
Tarandeep Singh [Wed, 2 Aug 2017 23:04:58 +0000 (23:04 +0000)]
Merge "Fix keyboard focus in VR" into oc-dr1-dev am:
986995d481
am:
7def2eea97
Change-Id: I538777a295628827fc3052c58641cbb659afad20
Android Build Merger (Role) [Wed, 2 Aug 2017 23:02:06 +0000 (23:02 +0000)]
Merge "Merge "Reland "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp am:
9f11a24d9c" into oc-mr1-dev-plus-aosp
Steven Moreland [Wed, 2 Aug 2017 23:00:50 +0000 (23:00 +0000)]
Merge "Reland "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp
am:
9f11a24d9c
Change-Id: If67fbbe4faa24eb01312a15e50763c0b297f271b
Android Build Merger (Role) [Wed, 2 Aug 2017 22:58:22 +0000 (22:58 +0000)]
Merge "Merge "Send TYPE_NOTIFICATION_STATE_CHANGED events for IMPORTANCE_LOW notifications." into oc-dr1-dev am:
c7937c13f6 -s ours am:
be0b8cdfa9" into oc-mr1-dev-plus-aosp
Daniel Sandler [Wed, 2 Aug 2017 22:57:05 +0000 (22:57 +0000)]
Merge "Send TYPE_NOTIFICATION_STATE_CHANGED events for IMPORTANCE_LOW notifications." into oc-dr1-dev am:
c7937c13f6 -s ours
am:
be0b8cdfa9
Change-Id: I4328eb2ef77ad9322e017a9a96d4455d199c1629
Chien-Yu Chen [Wed, 2 Aug 2017 22:54:40 +0000 (22:54 +0000)]
Merge "Merge "camera2: Fix template requirements" into oc-dev am:
2976109d89 am:
d5cc64f349" into oc-dr1-dev-plus-aosp
am:
8e00d3f2bf
Change-Id: I4901d05222f9641b1d5ebcff4af37e7175de35db
Android Build Merger (Role) [Wed, 2 Aug 2017 22:52:59 +0000 (22:52 +0000)]
Merge "Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev am:
e81cdeea1c" into oc-mr1-dev
Chien-Yu Chen [Wed, 2 Aug 2017 22:52:51 +0000 (22:52 +0000)]
Merge "camera2: Fix template requirements" into oc-dev am:
2976109d89 am:
615f9e1277
am:
5a7aefdb3d
Change-Id: I1ab537b6cc391b67e67b99bbb2f6da9dce545b45
Adrian Roos [Wed, 2 Aug 2017 22:51:23 +0000 (22:51 +0000)]
Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev
am:
e81cdeea1c
Change-Id: Idd7b5d3741f629b560e9de5b985d895a45e8a532
Santos Cordon [Wed, 2 Aug 2017 22:51:13 +0000 (22:51 +0000)]
Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev am:
adec8518af
am:
e061cc2e62
Change-Id: I3f300846fa7f2b6e063b67f8d39e76837d6fdeac
Android Build Merger (Role) [Wed, 2 Aug 2017 22:51:00 +0000 (22:51 +0000)]
Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am:
65abebbadd" into oc-mr1-dev
Jeff Sharkey [Wed, 2 Aug 2017 22:49:42 +0000 (22:49 +0000)]
Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev
am:
65abebbadd
Change-Id: I6ef312422ea84b352f8d07a9937c64394b14776a
Selim Cinek [Wed, 2 Aug 2017 22:49:41 +0000 (22:49 +0000)]
Merge "Fixed a clipping issue in AOD" into oc-dr1-dev am:
0ee78fd385
am:
cda30ced91
Change-Id: I45f177ac94bedefd20ad69995b845994f158dcd2
TreeHugger Robot [Wed, 2 Aug 2017 22:48:44 +0000 (22:48 +0000)]
Merge "Give DeviceStorageMonitorService it's own thread." into oc-mr1-dev
Jorim Jaggi [Wed, 2 Aug 2017 22:48:00 +0000 (22:48 +0000)]
Merge "Start all visible running activities when attaching app" into oc-dr1-dev am:
2af6f25f43
am:
d80432788e
Change-Id: I35bc021419486d0e9d263e4b1608097a89a6046e
Adrian Roos [Wed, 2 Aug 2017 22:46:12 +0000 (22:46 +0000)]
Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev am:
e81cdeea1c
am:
31cae6e859
Change-Id: Ia62990477d0f7b49658f841a1f5962b8b2ead580
Jeff Sharkey [Wed, 2 Aug 2017 22:43:52 +0000 (22:43 +0000)]
Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am:
65abebbadd
am:
eb6733e93a
Change-Id: I4bb82ed141cf10d74c5e6d0c08346cd6aeb73931
Evan Rosky [Wed, 2 Aug 2017 22:42:21 +0000 (22:42 +0000)]
Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev
am:
ae938cee71
Change-Id: I0b0fe6f7cc07362e98f7a5a2b54aa66bbd5ffc7f
Evan Rosky [Wed, 2 Aug 2017 22:40:48 +0000 (22:40 +0000)]
Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev am:
ae938cee71
am:
756685b506
Change-Id: I097489465c8bc066ddba04ea858c32f4af463a66
Daniel Sandler [Wed, 2 Aug 2017 22:38:45 +0000 (22:38 +0000)]
Merge "Send TYPE_NOTIFICATION_STATE_CHANGED events for IMPORTANCE_LOW notifications." into oc-dr1-dev am:
c7937c13f6
am:
d89d239d4b -s ours
Change-Id: I717e4fcdf76b12c7c3fce2058736d924a991c657
Daniel Sandler [Wed, 2 Aug 2017 22:38:22 +0000 (22:38 +0000)]
Merge "Send TYPE_NOTIFICATION_STATE_CHANGED events for IMPORTANCE_LOW notifications." into oc-dr1-dev
am:
c7937c13f6 -s ours
Change-Id: I466f7aa7f0cb0385343cabab94289c59c5f290eb
Christine Franks [Wed, 2 Aug 2017 22:03:42 +0000 (22:03 +0000)]
Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev
am:
8d753bc3a3
Change-Id: If7bc865f712dd09257ea07c01a90bc91531ab3b9
Christine Franks [Wed, 2 Aug 2017 21:54:28 +0000 (21:54 +0000)]
Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev
Steven Moreland [Wed, 2 Aug 2017 21:47:51 +0000 (21:47 +0000)]
Merge "services.core: remove use of -static hidl java" into stage-aosp-master am:
e79a0931f7
am:
9bd5b76318 -s ours
Change-Id: Ibaca955ef655e2b00ca96cc5c3a7de4eb21d3538
Adrian Roos [Wed, 2 Aug 2017 21:42:47 +0000 (21:42 +0000)]
Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev
am:
46f2cdeb63
Change-Id: Ia731476cb31e2a71caf277c29a6ebb34e0ccac90
Brad Ebinger [Wed, 2 Aug 2017 21:40:34 +0000 (21:40 +0000)]
Merge "Remove Conferenceable update squelching" into oc-dr1-dev
am:
4b6ef9c92d
Change-Id: I93a849f16c7c4d3bc4495f1baff905d16f0e78ff
Steven Moreland [Wed, 2 Aug 2017 21:35:46 +0000 (21:35 +0000)]
Merge "services.core: remove use of -static hidl java" into stage-aosp-master
am:
e79a0931f7
Change-Id: Ia87ef00c10528b161e36631726513d0b87845cc0
TreeHugger Robot [Wed, 2 Aug 2017 21:29:07 +0000 (21:29 +0000)]
Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 21:26:19 +0000 (21:26 +0000)]
Merge "Remove Conferenceable update squelching" into oc-dr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 21:22:49 +0000 (21:22 +0000)]
Merge "services.core: remove use of -static hidl java" into stage-aosp-master
Roozbeh Pournader [Wed, 2 Aug 2017 21:17:06 +0000 (21:17 +0000)]
Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev
am:
6e8e322ea1
Change-Id: I85033f9b16cf269f1c1ce6d01789d9ed40d1cb96
TreeHugger Robot [Wed, 2 Aug 2017 21:08:54 +0000 (21:08 +0000)]
Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev
Tarandeep Singh [Wed, 2 Aug 2017 20:42:08 +0000 (20:42 +0000)]
Merge "Fix keyboard focus in VR" into oc-dr1-dev
am:
986995d481
Change-Id: Ide81e21c24c6efd66c03c997dcaefbd0a3efd7b8
Tarandeep Singh [Wed, 2 Aug 2017 20:33:02 +0000 (20:33 +0000)]
Merge "Fix keyboard focus in VR" into oc-dr1-dev
Jeff Sharkey [Wed, 2 Aug 2017 20:24:35 +0000 (14:24 -0600)]
Give DeviceStorageMonitorService it's own thread.
When devices are low on space, it calls down into installd to clear
cached files, which can block for a long time. Instead of risking
the wrath of the Watchdog on IoThread, give ourselves a separate
thread.
Test: builds, boots
Bug:
64080821
Change-Id: Iaca00966bb836d58e8d2400d6c9d544023ef1af8
TreeHugger Robot [Wed, 2 Aug 2017 20:18:03 +0000 (20:18 +0000)]
Merge "Reland "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 2 Aug 2017 20:07:11 +0000 (20:07 +0000)]
Merge "Merge "camera2: Fix template requirements" into oc-dev am:
2976109d89 am:
d5cc64f349" into oc-dr1-dev-plus-aosp
Chien-Yu Chen [Wed, 2 Aug 2017 20:05:55 +0000 (20:05 +0000)]
Merge "camera2: Fix template requirements" into oc-dev am:
2976109d89
am:
d5cc64f349
Change-Id: I9928429d425d60c08568535495cffe3caa4de992
Chien-Yu Chen [Wed, 2 Aug 2017 20:05:22 +0000 (20:05 +0000)]
Merge "camera2: Fix template requirements" into oc-dev am:
2976109d89
am:
615f9e1277
Change-Id: I1c14baa9dc756fc91b6db1ba7f947a6fa4a4c4e8
Chien-Yu Chen [Wed, 2 Aug 2017 19:56:55 +0000 (19:56 +0000)]
Merge "camera2: Fix template requirements" into oc-dev
am:
2976109d89
Change-Id: I26487e8565aa190cff6e470bfdbc312b5ec83ceb
Chien-Yu Chen [Wed, 2 Aug 2017 19:56:55 +0000 (19:56 +0000)]
Merge "camera2: Fix template requirements" into oc-dev
am:
2976109d89
Change-Id: I20b68b33caf48afeead56116602c6a9b2a33ab26
Santos Cordon [Wed, 2 Aug 2017 19:46:23 +0000 (19:46 +0000)]
Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev
am:
adec8518af
Change-Id: I70c521db6bb979e6276a57a2b818f050bb8fafae
TreeHugger Robot [Wed, 2 Aug 2017 19:43:31 +0000 (19:43 +0000)]
Merge "camera2: Fix template requirements" into oc-dev
Romain Guy [Wed, 2 Aug 2017 19:43:30 +0000 (19:43 +0000)]
Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev am:
8e8debbe21
am:
0d8c1b81b9
Change-Id: I84ec688bd958ef563bbc6a48c1139e20dd0003f7
Selim Cinek [Wed, 2 Aug 2017 19:43:23 +0000 (19:43 +0000)]
Merge "Fixed a clipping issue in AOD" into oc-dr1-dev
am:
0ee78fd385
Change-Id: Ic3f5297c574aaa3598939399c623c2920623b3ba
TreeHugger Robot [Wed, 2 Aug 2017 19:38:08 +0000 (19:38 +0000)]
Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev
Jorim Jaggi [Wed, 2 Aug 2017 19:38:01 +0000 (19:38 +0000)]
Merge "Start all visible running activities when attaching app" into oc-dr1-dev
am:
2af6f25f43
Change-Id: I9f3d772141b872d5561b217e1cb3c0daa0cc1a71
Adrian Roos [Wed, 2 Aug 2017 19:35:48 +0000 (19:35 +0000)]
Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev
am:
e81cdeea1c
Change-Id: I03d14d8688a96ede9b92369b822bd928eaf10a03
Jeff Sharkey [Wed, 2 Aug 2017 19:33:49 +0000 (19:33 +0000)]
Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev
am:
65abebbadd
Change-Id: I5a78f799bde2926eb3f5f6f424148aaf11729c54
Romain Guy [Wed, 2 Aug 2017 19:33:19 +0000 (19:33 +0000)]
Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev
am:
8e8debbe21
Change-Id: I5e6ab8d1b1531980c9d699f4cacbafdcad56501d
Romain Guy [Wed, 2 Aug 2017 19:32:05 +0000 (19:32 +0000)]
Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev am:
8e8debbe21
am:
572379dde1
Change-Id: Iee98007bd02510558d3283d1950fcafa47b218c6
Selim Cinek [Wed, 2 Aug 2017 19:28:07 +0000 (19:28 +0000)]
Merge "Fixed a clipping issue in AOD" into oc-dr1-dev
Evan Rosky [Wed, 2 Aug 2017 19:25:42 +0000 (19:25 +0000)]
Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev
am:
ae938cee71
Change-Id: If8a2938a9f10a9c8b60b65323cd34713eeb95f40
Hangyu Kuang [Wed, 2 Aug 2017 19:22:36 +0000 (19:22 +0000)]
Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev
am:
26a4940296
Change-Id: Ibfa5394a612dcec663b1d8b4a301f94b1f2fb49e
TreeHugger Robot [Wed, 2 Aug 2017 19:20:19 +0000 (19:20 +0000)]
Merge "Start all visible running activities when attaching app" into oc-dr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 19:16:46 +0000 (19:16 +0000)]
Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 19:14:23 +0000 (19:14 +0000)]
Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 19:09:04 +0000 (19:09 +0000)]
Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev
Evan Rosky [Wed, 2 Aug 2017 19:08:18 +0000 (19:08 +0000)]
Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev
Android Build Merger (Role) [Wed, 2 Aug 2017 18:53:25 +0000 (18:53 +0000)]
Merge "Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am:
6407874ae0 am:
aaa431197f" into oc-mr1-dev-plus-aosp
Beverly [Wed, 2 Aug 2017 18:51:27 +0000 (18:51 +0000)]
Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am:
6407874ae0
am:
aaa431197f
Change-Id: I5e5bf9939b7fbfdb26ad07ab4ef22ada92e23a8a
Steven Moreland [Wed, 2 Aug 2017 18:25:28 +0000 (18:25 +0000)]
Reland "services.core: remove use of -static hidl java"
This reverts commit
be3162ea8521d7524e2ae31407dc3340f3ae4875.
Bug:
36376126
Test: marlin boots
Change-Id: Ic5317a10f9fe6792908f9db2fa6d5275fe7ea9c1
Beverly [Wed, 2 Aug 2017 18:49:46 +0000 (18:49 +0000)]
Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am:
6407874ae0
am:
7084e59bae
Change-Id: If30fd4e2ed88472b56e56dadbddb9cb46d0a7680
Daniel Sandler [Wed, 2 Aug 2017 18:46:55 +0000 (18:46 +0000)]
Merge "Send TYPE_NOTIFICATION_STATE_CHANGED events for IMPORTANCE_LOW notifications." into oc-dr1-dev
am:
c7937c13f6
Change-Id: If88c711e3a1fe502db9e73d33b330679d4ba6043
Romain Guy [Wed, 2 Aug 2017 18:44:40 +0000 (18:44 +0000)]
Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev
am:
8e8debbe21
Change-Id: I0f66cafd5eee8081f7af72bfb8cebdb93a619662
Daniel Sandler [Wed, 2 Aug 2017 18:40:34 +0000 (18:40 +0000)]
Merge "Send TYPE_NOTIFICATION_STATE_CHANGED events for IMPORTANCE_LOW notifications." into oc-dr1-dev
Beverly [Wed, 2 Aug 2017 18:39:02 +0000 (18:39 +0000)]
Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev
am:
6407874ae0
Change-Id: Ib0fcc0592a57be6bce184b729f1c25ee02595062
Beverly [Wed, 2 Aug 2017 18:38:00 +0000 (18:38 +0000)]
Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev
am:
6407874ae0
Change-Id: I8062e205af16792aa5ae0593795a940fc75813bc
TreeHugger Robot [Wed, 2 Aug 2017 18:35:10 +0000 (18:35 +0000)]
Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev
Steven Moreland [Wed, 2 Aug 2017 18:32:39 +0000 (18:32 +0000)]
Merge "Revert "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp
am:
7ac34b86e5
Change-Id: I104760c6893cd220b97a93b925b95e902cad4b37
Steven Moreland [Wed, 2 Aug 2017 18:24:43 +0000 (18:24 +0000)]
Merge "Revert "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp
Steven Moreland [Wed, 2 Aug 2017 18:23:01 +0000 (18:23 +0000)]
Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master am:
5de8c0ee40 am:
842447df3c
am:
75af963649
Change-Id: I4a04c1e9863de214f77340e6564c05e90c1d659f
TreeHugger Robot [Wed, 2 Aug 2017 18:22:03 +0000 (18:22 +0000)]
Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev
Steven Moreland [Wed, 2 Aug 2017 18:20:13 +0000 (18:20 +0000)]
Revert "services.core: remove use of -static hidl java"
Changes this depends on are missing from intermediate branches.
This reverts commit
31eb20f06acdbf20570c841198434005e3145e8b.
Change-Id: Ie3c30cf456f922d95ecb8859f0556095a491e2d6
Junda Liu [Wed, 2 Aug 2017 18:17:54 +0000 (18:17 +0000)]
Merge "Deprecate KEY_EDITABLE_TETHER_APN_BOOL." into oc-mr1-dev
am:
858a27c0b6
Change-Id: Id080a91ff04953a6c878ed18551cf71e20742e32
Android Build Merger (Role) [Wed, 2 Aug 2017 18:14:34 +0000 (18:14 +0000)]
Merge "Merge "Fix race condition when destroying view" into oc-dr1-dev am:
b0e5b53bbf am:
e5a48c5bcb" into oc-mr1-dev-plus-aosp
Steven Moreland [Wed, 2 Aug 2017 18:12:18 +0000 (18:12 +0000)]
Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master am:
5de8c0ee40
am:
842447df3c
Change-Id: I88abe8764bc50e1e1498cb02794c1728ad5bea69
Lucas Dupin [Wed, 2 Aug 2017 18:12:17 +0000 (18:12 +0000)]
Merge "Fix race condition when destroying view" into oc-dr1-dev am:
b0e5b53bbf
am:
e5a48c5bcb
Change-Id: I67e0ca0dd05d4989f3883ad98ed4a9cc58266ee1
Lucas Dupin [Wed, 2 Aug 2017 18:12:06 +0000 (18:12 +0000)]
Merge "Fix race condition when destroying view" into oc-dr1-dev am:
b0e5b53bbf
am:
aa65f36ffb
Change-Id: I197d45d0a274a68a17a3c8d83880d0a75a3b5456
TreeHugger Robot [Wed, 2 Aug 2017 18:09:41 +0000 (18:09 +0000)]
Merge "Deprecate KEY_EDITABLE_TETHER_APN_BOOL." into oc-mr1-dev
Steven Moreland [Wed, 2 Aug 2017 18:03:38 +0000 (18:03 +0000)]
Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master
am:
5de8c0ee40
Change-Id: I48d84d0d28d476dae84201b68e943e3ad4dae500
Lucas Dupin [Wed, 2 Aug 2017 18:03:21 +0000 (18:03 +0000)]
Merge "Fix race condition when destroying view" into oc-dr1-dev
am:
b0e5b53bbf
Change-Id: I6e07dca79e8d33522d4f0e9b58dcc48bdff555d2
Lucas Dupin [Wed, 2 Aug 2017 18:03:21 +0000 (18:03 +0000)]
Merge "Fix race condition when destroying view" into oc-dr1-dev
am:
b0e5b53bbf
Change-Id: I57e3c07e9390203a6eb201a314f3887fa7a678cd