OSDN Git Service
Chih-hung Hsieh [Wed, 28 Sep 2016 23:09:52 +0000 (23:09 +0000)]
Merge "Fix google-explicit-constructor warnings in gui and ui." am:
170454b0fa am:
5a283bbd40
am:
e7f4cb46c4
Change-Id: I46d36b040e143dd5eedae7597ec7875ab920ac7b
Chih-Hung Hsieh [Wed, 28 Sep 2016 23:09:39 +0000 (23:09 +0000)]
Merge "Fix google-explicit-constructor warnings in opengl." am:
9ccba3c090 am:
512fb374d2
am:
ba50990a04
Change-Id: I2ed99ac20752b794149b1e5a6b3b6403210034c5
Chih-hung Hsieh [Wed, 28 Sep 2016 23:07:24 +0000 (23:07 +0000)]
Merge "Fix google-explicit-constructor warnings in gui and ui." am:
170454b0fa
am:
5a283bbd40
Change-Id: I0eb6f2ed5005ce4cc7d2fa63172c28822b3b4985
Chih-Hung Hsieh [Wed, 28 Sep 2016 23:07:08 +0000 (23:07 +0000)]
Merge "Fix google-explicit-constructor warnings in opengl." am:
9ccba3c090
am:
512fb374d2
Change-Id: I1c62a8127f407eb8d675f40681acf42e7850ee57
Jesse Hall [Wed, 28 Sep 2016 23:04:08 +0000 (23:04 +0000)]
EGL: check that display is still valid am:
d6e9946cdd
am:
3169437feb
Change-Id: If2a509e29d5a8cbc06687469279523e5c07fd197
Chih-hung Hsieh [Wed, 28 Sep 2016 23:02:20 +0000 (23:02 +0000)]
Merge "Fix google-explicit-constructor warnings in gui and ui."
am:
170454b0fa
Change-Id: I1b95e35d622827f27b1637af00e312c055fd2c27
Chih-Hung Hsieh [Wed, 28 Sep 2016 23:02:07 +0000 (23:02 +0000)]
Merge "Fix google-explicit-constructor warnings in opengl."
am:
9ccba3c090
Change-Id: Icf73c478090ef837c24aa3b4b75152ad4eef3480
Jesse Hall [Wed, 28 Sep 2016 23:01:38 +0000 (23:01 +0000)]
EGL: check that display is still valid
am:
d6e9946cdd
Change-Id: I6d5f5e6f4790f16c1bd52f96743c7e138973a1b4
Chih-hung Hsieh [Wed, 28 Sep 2016 22:55:23 +0000 (22:55 +0000)]
Merge "Fix google-explicit-constructor warnings in gui and ui."
Treehugger Robot [Wed, 28 Sep 2016 22:55:16 +0000 (22:55 +0000)]
Merge "Fix google-explicit-constructor warnings in opengl."
Jesse Hall [Wed, 28 Sep 2016 18:26:57 +0000 (11:26 -0700)]
EGL: check that display is still valid
Bug:
31522731
Change-Id: I84d82e55aba5b58dfdbcac9e208c36767fbedfd1
Colin Cross [Wed, 28 Sep 2016 21:11:42 +0000 (21:11 +0000)]
Merge "Fix order of operations warning in libui" am:
73d4186757 am:
1b080b15aa
am:
544c391292
Change-Id: I8fbce66a7a5f41281fa12ce34869f2a1b5e10413
Colin Cross [Wed, 28 Sep 2016 21:11:28 +0000 (21:11 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am:
8cdcd15c38 am:
5c9421500e
am:
ef2e1afdc2
Change-Id: I1656836e48b6092602c0a4bf8135084fe8da7df5
Colin Cross [Wed, 28 Sep 2016 21:04:31 +0000 (21:04 +0000)]
Merge "Fix order of operations warning in libui" am:
73d4186757
am:
1b080b15aa
Change-Id: I959d837f06cfbc747261b92d7202b953ee2e15f1
Colin Cross [Wed, 28 Sep 2016 21:02:00 +0000 (21:02 +0000)]
Merge "Fix order of operations warning in libui"
am:
73d4186757
Change-Id: Ib93a8ddcb912b05cd38db1dea7ac0ff21a788bcd
Colin Cross [Wed, 28 Sep 2016 21:02:00 +0000 (21:02 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am:
8cdcd15c38
am:
5c9421500e
Change-Id: I9f971b18ff7fa72241eb860a782c9a585f8e56f8
Colin Cross [Wed, 28 Sep 2016 20:59:31 +0000 (20:59 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
am:
8cdcd15c38
Change-Id: If6768b8a9468833f0fec5025f95c1796dc2869ca
Colin Cross [Wed, 28 Sep 2016 20:57:56 +0000 (20:57 +0000)]
Merge "Fix order of operations warning in libui"
Colin Cross [Tue, 27 Sep 2016 21:09:07 +0000 (14:09 -0700)]
Fix order of operations warning in libui
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I21f34567927125d3eeeecd8f00271a175f93af21
Colin Cross [Wed, 28 Sep 2016 20:53:15 +0000 (20:53 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
Dimitry Ivanov [Wed, 28 Sep 2016 19:07:22 +0000 (19:07 +0000)]
Merge "Add missing liblog dependency" am:
c4dd0c3b83 am:
abd9a76f5e
am:
924fd128fc
Change-Id: I4ec9bf4e9842e9ca9353532e93b322991db685ca
Dimitry Ivanov [Wed, 28 Sep 2016 19:04:22 +0000 (19:04 +0000)]
Merge "Add missing liblog dependency" am:
c4dd0c3b83
am:
abd9a76f5e
Change-Id: Iff76ef4ef129b4e1e76786998a0cbf9acec08f3b
Dimitry Ivanov [Wed, 28 Sep 2016 19:01:21 +0000 (19:01 +0000)]
Merge "Add missing liblog dependency"
am:
c4dd0c3b83
Change-Id: I710f932670b8374e11a19fe96f2a53b622753468
Dimitry Ivanov [Wed, 28 Sep 2016 18:56:35 +0000 (18:56 +0000)]
Merge "Add missing liblog dependency"
Colin Cross [Mon, 26 Sep 2016 20:48:25 +0000 (13:48 -0700)]
Fix struct vs. class mismatch in forward definitions
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: If2bae8b2fbc4238d6251cdd78bc7b5216684f99d
Dan Albert [Wed, 28 Sep 2016 08:59:43 +0000 (08:59 +0000)]
Merge "Include what we use." am:
be7fdfc2a1 am:
7e46950b9e
am:
2e9f5e36b5
Change-Id: I4b8f70dc86df8eeefb4a246084a87d50500e7632
Dan Albert [Wed, 28 Sep 2016 08:57:12 +0000 (08:57 +0000)]
Merge "Include what we use." am:
be7fdfc2a1
am:
7e46950b9e
Change-Id: I898b65a7aafd46fe04dff729307c8a7532053f0c
Dan Albert [Wed, 28 Sep 2016 08:54:12 +0000 (08:54 +0000)]
Merge "Include what we use."
am:
be7fdfc2a1
Change-Id: Ifb6f3d6424dc3f1295a8c50a8773b58410b562d9
Treehugger Robot [Wed, 28 Sep 2016 08:50:27 +0000 (08:50 +0000)]
Merge "Include what we use."
Dan Albert [Wed, 28 Sep 2016 07:03:56 +0000 (00:03 -0700)]
Include what we use.
Test: make checkbuild
Bug: None
Change-Id: If803e761c6d7e0c6d043bbcd2ace47f373495db3
Colin Cross [Wed, 28 Sep 2016 04:04:18 +0000 (04:04 +0000)]
Merge changes I7748934f,I008ef537,I1027e87f am:
132fb22957 am:
ab6e9c8664
am:
0c4994a522
Change-Id: I41d47cf42faa75a2ca48397646be110d141bbdd2
Colin Cross [Wed, 28 Sep 2016 04:04:10 +0000 (04:04 +0000)]
Fix constructor parameters shadowing member variables am:
382ecd3d63 am:
6c79fc7bec
am:
177b452c8c
Change-Id: I1798f49b90a0431c84711c531706e96783fa6802
Colin Cross [Wed, 28 Sep 2016 04:04:02 +0000 (04:04 +0000)]
Use uint32_t consistently for region op am:
8f279960c6 am:
19bf9a2f27
am:
66b52bae7a
Change-Id: Ic88d190dd73525e901279bdf80897bd0cace004f
Colin Cross [Wed, 28 Sep 2016 04:03:54 +0000 (04:03 +0000)]
Fix trailing semicolon warnings am:
17576de056 am:
170ae8a510
am:
df1b5a19fd
Change-Id: I1beb53002656be0ca988c18108d5e9a565a1f707
Colin Cross [Wed, 28 Sep 2016 03:58:45 +0000 (03:58 +0000)]
Merge changes I7748934f,I008ef537,I1027e87f am:
132fb22957
am:
ab6e9c8664
Change-Id: I6e45359233ab789375c4493f06135e16a3934299
Colin Cross [Wed, 28 Sep 2016 03:58:38 +0000 (03:58 +0000)]
Fix constructor parameters shadowing member variables am:
382ecd3d63
am:
6c79fc7bec
Change-Id: I5bf56d1691c20cd7830f309e88f13064837c7ccf
Colin Cross [Wed, 28 Sep 2016 03:58:31 +0000 (03:58 +0000)]
Use uint32_t consistently for region op am:
8f279960c6
am:
19bf9a2f27
Change-Id: Ia4ed908c51a32ed3ad255b244609983399b7cc44
Colin Cross [Wed, 28 Sep 2016 03:58:23 +0000 (03:58 +0000)]
Fix trailing semicolon warnings am:
17576de056
am:
170ae8a510
Change-Id: Iad76ba1b19d0e74f98ac217d40fbc1afd09a014d
Dan Albert [Wed, 28 Sep 2016 03:52:10 +0000 (03:52 +0000)]
Merge "Migrate libandroid headers to ndk_headers." am:
fd9d1fb52b am:
c356d61d00
am:
010e7af396
Change-Id: Iff50ea1ca85b1702881203a51f14a0bff09ab2e3
Colin Cross [Wed, 28 Sep 2016 03:51:56 +0000 (03:51 +0000)]
Merge changes I7748934f,I008ef537,I1027e87f
am:
132fb22957
Change-Id: Idb0a92939564554becffe4cfa7209f9c220176e6
Colin Cross [Wed, 28 Sep 2016 03:51:55 +0000 (03:51 +0000)]
Fix constructor parameters shadowing member variables
am:
382ecd3d63
Change-Id: I89fc7c1780eab42ab17e028997db2d125f59c2d8
Colin Cross [Wed, 28 Sep 2016 03:51:37 +0000 (03:51 +0000)]
Use uint32_t consistently for region op
am:
8f279960c6
Change-Id: Ibe726f674fc22ca69cd33242ff0059ac6dd70c48
Colin Cross [Wed, 28 Sep 2016 03:51:27 +0000 (03:51 +0000)]
Fix trailing semicolon warnings
am:
17576de056
Change-Id: I6bb34741553c12225d62fd4fdcde74e14502a15c
Dan Albert [Wed, 28 Sep 2016 03:43:03 +0000 (03:43 +0000)]
Merge "Migrate libandroid headers to ndk_headers." am:
fd9d1fb52b
am:
c356d61d00
Change-Id: I39d19a30d34b2c2f13a0be9609972e332a86c014
Colin Cross [Wed, 28 Sep 2016 03:37:50 +0000 (03:37 +0000)]
Merge changes I7748934f,I008ef537,I1027e87f
* changes:
Fix constructor parameters shadowing member variables
Use uint32_t consistently for region op
Fix trailing semicolon warnings
Dan Albert [Wed, 28 Sep 2016 03:37:33 +0000 (03:37 +0000)]
Merge "Migrate libandroid headers to ndk_headers."
am:
fd9d1fb52b
Change-Id: I3762d8549bc449283c874f420d0fa72bda40f244
Peng Xu [Wed, 28 Sep 2016 03:36:53 +0000 (03:36 +0000)]
Merge "[sensorservice] Fix inconsistent states in SensorDevice" into cw-f-dev
am:
0627130b28
Change-Id: Ifa7a7da62d5862a261c491db9c2ed701e18ad59b
Peng Xu [Wed, 28 Sep 2016 03:36:52 +0000 (03:36 +0000)]
[sensorservice] Fix inconsistent states in SensorDevice
am:
4f707f8b3d
Change-Id: I1090cee6b4b81e10d0b5bc31ab879b1a3788d407
Treehugger Robot [Wed, 28 Sep 2016 03:32:56 +0000 (03:32 +0000)]
Merge "Migrate libandroid headers to ndk_headers."
Peng Xu [Wed, 28 Sep 2016 03:31:35 +0000 (03:31 +0000)]
Merge "[sensorservice] Fix inconsistent states in SensorDevice" into cw-f-dev
Colin Cross [Mon, 26 Sep 2016 20:33:59 +0000 (13:33 -0700)]
Fix constructor parameters shadowing member variables
Using the same name for the constructor parameter and the member
variable causes a warning that was being hidden by the use of -isystem
to include frameworks/native/include. Prefix the parameter with an
underscore.
Bug:
31752268
Test: m -j
Change-Id: I7748934f1e9515176e2ae98d2c0e58d165a7a5c2
Colin Cross [Mon, 26 Sep 2016 20:08:16 +0000 (13:08 -0700)]
Use uint32_t consistently for region op
An implicit conversion warning was being hidden by the use of -isystem
to include frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I008ef537a24311d58816fae12ef8c4aeaba07547
Colin Cross [Mon, 26 Sep 2016 20:07:06 +0000 (13:07 -0700)]
Fix trailing semicolon warnings
Remove semicolons after inline function definitions. The warnings were
being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I1027e87f459c36a575cd04b3afb645736832b07b
Dimitry Ivanov [Tue, 27 Sep 2016 16:29:02 +0000 (09:29 -0700)]
Add missing liblog dependency
Bug: http://b/
31289077
Bug: http://b/
27171986
Test: remove liblog from libcutils and recompile
Change-Id: I01e7a0ca758308b5f85f2a08f34a9671eaa48b10
Lorenzo Colitti [Tue, 27 Sep 2016 13:16:56 +0000 (13:16 +0000)]
Add socket dumps via ss to bugreports. am:
d3b809baff
am:
e0e7206725
Change-Id: I1b1e1b7c4e816e9168eeebcfe089cef6815a1720
Lorenzo Colitti [Tue, 27 Sep 2016 13:14:25 +0000 (13:14 +0000)]
Add socket dumps via ss to bugreports.
am:
d3b809baff
Change-Id: I85daa9d7faf6cb0067955d235e4f12fe807adf5c
Peng Xu [Mon, 26 Sep 2016 18:28:32 +0000 (11:28 -0700)]
[sensorservice] Fix inconsistent states in SensorDevice
This CL avoids inconsistent disabled client list when sensorservice
is in restricted mode and a restricted sensor event connection is
destroyed.
The inconsistency can cause registerLister error in sensor CTS.
Also removed the additional logging message since they are no longer
necessary.
Bug:
28533594
Test: Running "cts-tradefed run singleCommand cts-dev --module
CtsHardwareTestCases --test android.hardware.cts.SensorBatchingTests"
continuously while keep registering and unregistering sensor listener
in a separate app (e.g. enable BreakIt mode in SensorLogger).
Change-Id: I601aea87c88511f5543a80c4921ee4822cb89dff
Dimitry Ivanov [Mon, 26 Sep 2016 19:08:58 +0000 (19:08 +0000)]
Merge "Add missing liblog dependency" am:
b32a59e797 am:
f12ea76ef3
am:
2851a53929
Change-Id: I6ae1d8283de37feec8c2f53af018b1ff470a2786
David Pursell [Mon, 26 Sep 2016 19:08:35 +0000 (19:08 +0000)]
Merge "libgui: add a test for Sensor serialization." am:
01a0c92da0 am:
cca7f83210
am:
36c879bb7a
Change-Id: Ifb3fcb554165a0b2ef6de38e0a71898fe84a0526
Lorenzo Colitti [Mon, 26 Sep 2016 04:37:45 +0000 (13:37 +0900)]
Add socket dumps via ss to bugreports.
Bug:
23113288
Change-Id: I6304425f968fcb22c75c3f6e64bf7992e34e0889
Dimitry Ivanov [Sat, 24 Sep 2016 22:19:45 +0000 (22:19 +0000)]
Merge "Add missing liblog dependency" am:
b32a59e797
am:
f12ea76ef3
Change-Id: I45aaf4f8f9ff72ce0f5ea37f750616abdd3fc138
Dimitry Ivanov [Sat, 24 Sep 2016 22:16:19 +0000 (22:16 +0000)]
Merge "Add missing liblog dependency"
am:
b32a59e797
Change-Id: I8ed998f6342914164f89ce8584bca61b8daa4244
Dimitry Ivanov [Sat, 24 Sep 2016 22:07:19 +0000 (22:07 +0000)]
Merge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 24 Sep 2016 00:22:33 +0000 (17:22 -0700)]
Add missing liblog dependency
Bug: http://b/
31289077
Bug: http://b/
27171986
Test: remove liblog from libcutils and recompile
Change-Id: I5d6ded54613e8a29f20495d8f977064f0af2ffd6
David Pursell [Fri, 23 Sep 2016 23:54:04 +0000 (23:54 +0000)]
Merge "libgui: add a test for Sensor serialization." am:
01a0c92da0
am:
cca7f83210
Change-Id: Id8e064040f9d3a167bd3501fa16c3b5b4d4721d8
David Pursell [Fri, 23 Sep 2016 23:52:03 +0000 (23:52 +0000)]
Merge "libgui: add a test for Sensor serialization."
am:
01a0c92da0
Change-Id: Idac427f7e0fa170b1a70ad274f39994361fa452d
Treehugger Robot [Fri, 23 Sep 2016 23:44:11 +0000 (23:44 +0000)]
Merge "libgui: add a test for Sensor serialization."
Ajay Panicker [Fri, 23 Sep 2016 23:43:29 +0000 (16:43 -0700)]
Merge commit '
bc06c07ee7677168d71a9c809a8960f39340ff99' into blah
Change-Id: I6cbd56cd2ee42de56736642e617689c412056e42
Ajay Panicker [Fri, 23 Sep 2016 23:09:50 +0000 (23:09 +0000)]
Merge "Add btsnoop_hci.log to bugreport zip (1/2)" am:
d95b2eb2f6
am:
7821d52b4e
Change-Id: If0666e35c49942a980c538bf02d29010cfe70545
Ajay Panicker [Fri, 23 Sep 2016 23:07:50 +0000 (23:07 +0000)]
Merge "Add btsnoop_hci.log to bugreport zip (1/2)"
am:
d95b2eb2f6
Change-Id: Ida600de84569296a3c146ca54aba86f9b88a5816
Ajay Panicker [Fri, 23 Sep 2016 23:01:16 +0000 (23:01 +0000)]
Merge "Add btsnoop_hci.log to bugreport zip (1/2)"
Dan Albert [Fri, 23 Sep 2016 22:57:45 +0000 (15:57 -0700)]
Migrate libandroid headers to ndk_headers.
Test: make native
Bug: http://b/
30465923
Change-Id: I0ef0b3630670241c4efd22515b6ab13eb41a81b3
Ajay Panicker [Wed, 14 Sep 2016 19:26:46 +0000 (12:26 -0700)]
Add btsnoop_hci.log to bugreport zip (1/2)
Bug:
28672558
Test: Manual
Merged-In: I2995a9fd0e8be031c022ef8f275aae35265ba452
Change-Id: I2995a9fd0e8be031c022ef8f275aae35265ba452
David Pursell [Fri, 23 Sep 2016 16:08:26 +0000 (09:08 -0700)]
libgui: add a test for Sensor serialization.
On a few test boards we've hit a problem with Sensor serialization
causing a SIGBUS due to misaligned access. This is being fixed in
Flattenable.h, but adding a test here to verify the fix and detect
regression seems like a good idea.
Bug: http://b/
31671510
Test: adb shell /data/nativetest/libgui_test/libgui_test \
--gtest_filter=SensorTest.*
Change-Id: I233359b04789dabe2246b95051290e101e0bd2c1
Rob Carr [Thu, 22 Sep 2016 23:34:40 +0000 (23:34 +0000)]
Merge "Surface: Add force disconnection method." into nyc-mr1-dev am:
6cc1933af9
am:
a92604b3cd
Change-Id: I791e00bc2584581066f6cda89ea0bda063ba0645
Robert Carr [Thu, 22 Sep 2016 23:34:27 +0000 (23:34 +0000)]
Surface: Add force disconnection method. am:
97b9c86338
am:
962b13b9be
Change-Id: Ie74482a867c24213a25332650b38c733e183630b
Jeff Sharkey [Thu, 22 Sep 2016 23:32:08 +0000 (23:32 +0000)]
Recursively restorecon when SELinux label changes. am:
993de79607
am:
59d31b669b
Change-Id: I51739d604afa86b993123bd8cc6d46c6743618a2
Rob Carr [Thu, 22 Sep 2016 23:24:12 +0000 (23:24 +0000)]
Merge "Surface: Add force disconnection method." into nyc-mr1-dev
am:
6cc1933af9
Change-Id: Ice30ea86acd7abfa71c0053dc1459361b4bbfb6c
Robert Carr [Thu, 22 Sep 2016 23:24:11 +0000 (23:24 +0000)]
Surface: Add force disconnection method.
am:
97b9c86338
Change-Id: Ia9f9dbdcbd9527d54dacb2cdc90eda443230e8d9
Jeff Sharkey [Thu, 22 Sep 2016 22:41:00 +0000 (22:41 +0000)]
Recursively restorecon when SELinux label changes.
am:
993de79607
Change-Id: Ibf9b6beaa58e7e6c2f006e8c6f064330624eb29f
Rob Carr [Thu, 22 Sep 2016 21:17:40 +0000 (21:17 +0000)]
Merge "Surface: Add force disconnection method." into nyc-mr1-dev
Wei Liu [Thu, 22 Sep 2016 20:04:16 +0000 (20:04 +0000)]
Merge "Dumpstate should hold a wakelock to save bug report time." into cw-f-dev
am:
64076bac3f
Change-Id: Ia1f4644556e9f5632b5ce23b6379a43a2d1cba1c
Wei Liu [Thu, 22 Sep 2016 19:02:08 +0000 (19:02 +0000)]
Dumpstate should hold a wakelock to save bug report time.
am:
f87959e007
Change-Id: I43fe43f8142e3084d69f336414c19a079dfb9ebc
Wei Liu [Thu, 22 Sep 2016 18:37:22 +0000 (18:37 +0000)]
Merge "Dumpstate should hold a wakelock to save bug report time." into cw-f-dev
Jeff Sharkey [Wed, 21 Sep 2016 00:21:42 +0000 (18:21 -0600)]
Recursively restorecon when SELinux label changes.
PackageManager has been pretty aggressive about asking installd to
restorecon over app data when it thinks something might have
changed. However, in the vast majority of cases these are no-op
requests, and we waste a bunch of time recursively walking all
private data, easily costing 60+ seconds on dogfooder devices.
This change updates the initial "create_app_data" command to kick off
a recursive restorecon if it detects that the top-level SELinux label
on the app private data directory changes. The "create_app_data"
command is designed to ensure that an app's storage is ready, so
PackageManager always calls it at least once per boot before apps
can run. (This change means that PackageManager no longer needs to
make separate "restorecon_app_data" calls.)
Test: booted, verified that a label change triggered restorecon
Bug:
30768146
Change-Id: I0c8d4018cf8ff888d0ae07a82adc3d61a6002aad
Ashutosh Joshi [Wed, 21 Sep 2016 19:25:16 +0000 (19:25 +0000)]
Merge "Show masked value for sensor with permission" into cw-f-dev
am:
ee36adbde7
Change-Id: I755533dbff110702bbf851c8e0a6ec2035fa28c2
Peng Xu [Wed, 21 Sep 2016 19:25:15 +0000 (19:25 +0000)]
Show masked value for sensor with permission
am:
fba3c11b5e
Change-Id: If4b9fd323d0f8333cd1d1dea8c1d801b43c7e157
Ashutosh Joshi [Wed, 21 Sep 2016 19:16:55 +0000 (19:16 +0000)]
Merge "Show masked value for sensor with permission" into cw-f-dev
Josh Gao [Wed, 21 Sep 2016 01:12:46 +0000 (01:12 +0000)]
Merge "Rename unique_fd::clear to unique_fd::reset." am:
f9f04003f5 am:
44bd6ca0d0
am:
d1a3db64c5
Change-Id: Ica8691bfa5ff84dabe9e026dfae46e8093cf4fb4
Josh Gao [Wed, 21 Sep 2016 01:10:14 +0000 (01:10 +0000)]
Merge "Rename unique_fd::clear to unique_fd::reset." am:
f9f04003f5
am:
44bd6ca0d0
Change-Id: Ie664fd18862e404845b2702ff546719818190cd1
Josh Gao [Wed, 21 Sep 2016 01:07:32 +0000 (01:07 +0000)]
Merge "Rename unique_fd::clear to unique_fd::reset."
am:
f9f04003f5
Change-Id: I856ff1bdb5735a90e3b6c13d2f7a2deeff0388e0
Josh Gao [Wed, 21 Sep 2016 01:03:06 +0000 (01:03 +0000)]
Merge "Rename unique_fd::clear to unique_fd::reset."
Josh Gao [Mon, 19 Sep 2016 19:44:50 +0000 (12:44 -0700)]
Rename unique_fd::clear to unique_fd::reset.
Test: m checkbuild
Change-Id: I8cbf2b538c270d8ef50ab6fdcf4fecbcd65899a8
Jesse Hall [Mon, 19 Sep 2016 18:05:10 +0000 (18:05 +0000)]
Merge "libvulkan: Fix count returned for incomplete wsi queries" am:
75bb94fe7e am:
f4171ecd58
am:
7f3fdaa059
Change-Id: I731446903759e0acefa6cd453d6d25e2c2011fd3
Jesse Hall [Mon, 19 Sep 2016 18:02:08 +0000 (18:02 +0000)]
Merge "libvulkan: Fix count returned for incomplete wsi queries" am:
75bb94fe7e
am:
f4171ecd58
Change-Id: I549bdd589575e505063de0ed4aa7fda97c481e32
Jesse Hall [Mon, 19 Sep 2016 17:58:39 +0000 (17:58 +0000)]
Merge "libvulkan: Fix count returned for incomplete wsi queries"
am:
75bb94fe7e
Change-Id: I0567dca837c6a56d0af14eb0ace73318386b444d
Jesse Hall [Mon, 19 Sep 2016 17:51:36 +0000 (17:51 +0000)]
Merge "libvulkan: Fix count returned for incomplete wsi queries"
Jesse Hall [Fri, 16 Sep 2016 04:26:01 +0000 (21:26 -0700)]
libvulkan: Fix count returned for incomplete wsi queries
When vkGetPhysicalDeviceSurfaceFormatsKHR,
vkGetPhysicalDevicePresentModesKHR, and vkGetSwapchainImagesKHR
returned VK_INCOMPLETE, they would overwrite the count parameter with
the number of available items, rather than the number of returned
items.
Change-Id: I6a736770f90b95ad15bfcfbe5afb4d2886817dcb
Fixes:
31490492
Test: https://gerrit.khronos.org/#/c/158/
Dan Stoza [Fri, 16 Sep 2016 19:47:02 +0000 (19:47 +0000)]
HWC2On1: Fall back to GLES for SolidColor am:
5df47cb648
am:
d946ae67c2
Change-Id: I9c866a4cbf23f4e8dcdaf922063c4a26f7da7c51
Dan Stoza [Fri, 16 Sep 2016 19:45:01 +0000 (19:45 +0000)]
HWC2On1: Fall back to GLES for SolidColor
am:
5df47cb648
Change-Id: I485ae0aa189b5338f6f98dd3c716dd87dac60ab1
OSDN Git Service
