Commit graph

7972 commits

Author SHA1 Message Date
Wally Yau
c8145123db Merge "hdmi_cec: deal with the framework side went away." 2017-11-08 21:41:45 +00:00
TreeHugger Robot
907e62ca59 Merge changes from topic "health2_compat_mat"
* changes:
  fwk compat mat: health@2.0 is required
  fwk compat mat: add health@2.0
2017-11-08 03:08:56 +00:00
Yifan Hong
0b537d0bc8 fwk compat mat: health@2.0 is required
... on "current" compat mat level. They are kept optional
on upgrading devices.

Test: builds (assemble_vintf passes)
Bug: 63702641
Change-Id: Iafe64c4ffa7df8aa7f80a1b6cf599d56e7854f33
2017-11-07 15:34:37 -08:00
Yifan Hong
cb9d32c0b6 fwk compat mat: add health@2.0
framework & storaged talks to health@2.0 HAL prior to healthd.

If the vendor service for health@2.0 is missing, framework / storaged
falls back and talks to healthd. Hence health@2.0 HAL is optional.

A follow-up change is needed to require launch devices to launch
with health@2.0 (i.e. current.xml says optional=false).

Bug: 62229583
Test: builds (assemble_vintf passes)

Change-Id: I49caca2b683e928f25e6f3cac2e2a8396b50f46a
2017-11-07 15:32:31 -08:00
Steven Moreland
d28c1bdf62 Merge "Automatic mk -> bp." am: e5fd969f19 am: 72c720a4e3
am: 26013bf6ac

Change-Id: Id936fb4806d122045c771c951220361efeef10c6
2017-11-07 21:24:49 +00:00
Steven Moreland
26013bf6ac Merge "Automatic mk -> bp." am: e5fd969f19
am: 72c720a4e3

Change-Id: Icfc8b46117e94461906806023852836a0ace3a55
2017-11-07 21:21:40 +00:00
Steven Moreland
72c720a4e3 Merge "Automatic mk -> bp."
am: e5fd969f19

Change-Id: I1343aae4bbf351d30fad7d363c5a7ebfe1763eaf
2017-11-07 21:19:40 +00:00
Treehugger Robot
e5fd969f19 Merge "Automatic mk -> bp." 2017-11-07 21:12:59 +00:00
Chia-I Wu
d4bb253b18 graphics: add OWNERS file to default implementations am: e3b1836d90 am: d9c63996ce
am: eb4eba96c9

Change-Id: Ieef144876dfa608ddf34de391ce40e8fd8d6c7c4
2017-11-07 19:12:52 +00:00
Chia-I Wu
eb4eba96c9 graphics: add OWNERS file to default implementations am: e3b1836d90
am: d9c63996ce

Change-Id: I3b582fba337306fe2fb32b5b480ccef7d763a97d
2017-11-07 19:00:29 +00:00
Chia-I Wu
d9c63996ce graphics: add OWNERS file to default implementations
am: e3b1836d90

Change-Id: I45de2bcefa5c74d9d97a8e47871b7fc0226e3a79
2017-11-07 18:56:30 +00:00
Chia-I Wu
23dbc0f5ab graphics: support FB HAL using HWC2OnFbAdapter am: 16e8ed254d am: 20b073fe6c
am: 85ade632ce

Change-Id: I6f020f5fbe0ecd04d5115e1553169b23bf3d196f
2017-11-07 18:23:51 +00:00
Chia-I Wu
441f4cf02c graphics: require validateDisplay after onRefresh am: 8101b24ca7 am: a565609b83
am: e051dcef99

Change-Id: Ia93b355842c7c37f9b4bccc50fd8280af5f811ef
2017-11-07 18:23:42 +00:00
Steven Thomas
e24194f7c1 Guard against racy ComposerClient reconnection am: bc67a6a8fb am: 38d3da23d7
am: cacc07d56c

Change-Id: I1ba04152f2f7ef70089090d68124fd24cb1a4e8a
2017-11-07 18:23:33 +00:00
Chia-I Wu
85ade632ce graphics: support FB HAL using HWC2OnFbAdapter am: 16e8ed254d
am: 20b073fe6c

Change-Id: I3e50c5f00b8385a33ff1d04622102ca041cc408d
2017-11-07 18:19:19 +00:00
Chia-I Wu
e051dcef99 graphics: require validateDisplay after onRefresh am: 8101b24ca7
am: a565609b83

Change-Id: I713f68f0b789acac0ab1340f1a2de9a514a8079d
2017-11-07 18:19:13 +00:00
Steven Thomas
cacc07d56c Guard against racy ComposerClient reconnection am: bc67a6a8fb
am: 38d3da23d7

Change-Id: I79fab8d654129de6966a2a71920e444996405ac9
2017-11-07 18:18:10 +00:00
Chia-I Wu
20b073fe6c graphics: support FB HAL using HWC2OnFbAdapter
am: 16e8ed254d

Change-Id: Ifacd46c8b77d54ab807c5c6dbc1ca19c2d13454e
2017-11-07 18:13:34 +00:00
Chia-I Wu
a565609b83 graphics: require validateDisplay after onRefresh
am: 8101b24ca7

Change-Id: Ic402f325230b520dab53fda3ea8fe1cc25b94b54
2017-11-07 18:13:31 +00:00
Steven Thomas
38d3da23d7 Guard against racy ComposerClient reconnection
am: bc67a6a8fb

Change-Id: I9eb651ead1cfeef8a1f1d485134890fbc075cd12
2017-11-07 18:13:29 +00:00
Chia-I Wu
e3b1836d90 graphics: add OWNERS file to default implementations
Test: none
Change-Id: I76a3c84a1fcb61dffa4641ec2120e484752bdf5b
2017-11-07 08:53:12 -08:00
Yifan Hong
f86271dbcd Health@2.0: IHealthInfoCallback uses 1.0 HealthInfo.
BatteryService does not use these fields for posting
sticky intents.

This is a partial revert of commit
cbfb15e0b8.

Bug: 63702641
Test: boots
Change-Id: Id6596b04daaa19ae97d783c7a8bc111a43725334
2017-11-06 17:10:33 -08:00
Chia-I Wu
16e8ed254d graphics: support FB HAL using HWC2OnFbAdapter
FB (framebuffer) HAL has been replaced by HWC HAL for 5+ years, but
we still support the legacy path in SurfaceFlinger.  Devices using
the legacy path cannot be Treblized.

This change allows such devices to use HIDL IComposer, by adding
support for FB HAL in the default implementation.

Test: boots hikey960
Change-Id: Ie9050bbcaac0fd5b134786f4f9f0f5075f4ebd0c
2017-11-06 15:08:07 -08:00
Chia-I Wu
8101b24ca7 graphics: require validateDisplay after onRefresh
After initialization or onRefresh, we want to make sure
validateDisplay is called before presentDisplay.

Bug: 67505273
Test: manual
Change-Id: Id876d9251586aaaf552ca82c52f8f902af364251
2017-11-06 15:08:07 -08:00
Steven Thomas
bc67a6a8fb Guard against racy ComposerClient reconnection
The hardware composer service has a rule that only one client can be
connected at a time. The surface flinger process, when transitioning
composer ownership from surface flinger to vr flinger, will destroy the
current client on one thread and create a new client on another
thread. Although surface flinger ensures that these events happen in the
expected sequence (delete then create), the requests sometimes land in
the hardware composer service in inverted order, causing the creation
request to fail with an error.

Instead of failing with an error, block for a brief period (1 second)
until the existing client is removed, then proceed to initialize the new
client. This gives us enough time to ensure an inverted
creation/destruction order doesn't cause client creation to fail, while
avoiding a deadlock if the existing client is never destroyed.

Bug: 62925812

Test: - Transitioned to/from vr flinger hundreds of times, and confirmed
I no longer see sporadic composer client creation failure due to an
already existing client.

- Ran the vts graphics composer tests and confirmed they all pass.

Change-Id: I40be1fb0cb3d42ddb5a9fc159188886e9f5b6267
2017-11-06 15:08:07 -08:00
Steven Moreland
9aec6164fd Merge "dumpstate mk -> bp" am: b1088c6de1 am: 9251e71740
am: d292895d0d

Change-Id: I8bc36d2c12c427e14df46f8a6bec76fa4f99cae6
2017-11-06 18:16:21 +00:00
Steven Moreland
d292895d0d Merge "dumpstate mk -> bp" am: b1088c6de1
am: 9251e71740

Change-Id: I4cdfb67a299ca6ab601306e1ef83d099eabbd8f8
2017-11-06 18:10:11 +00:00
Steven Moreland
9251e71740 Merge "dumpstate mk -> bp"
am: b1088c6de1

Change-Id: I87ce7729e0a8775f7859eab6de48803209aa5941
2017-11-06 18:05:38 +00:00
Treehugger Robot
b1088c6de1 Merge "dumpstate mk -> bp" 2017-11-06 17:56:38 +00:00
chenhg
108a72a20a hdmi_cec: deal with the framework side went away.
Register a death recipient to remove the callback if
the framework side died.

BUG: 67913697
Test: VTS
Change-Id: I51ce5c85c9ec5d1bc90cac72f314647e1075d657
2017-11-03 11:39:33 -07:00
Steven Moreland
90e3a50f03 Automatic mk -> bp.
Automatic mk -> bp conversion for all modules here
which can be converted and built automatically.

Test: Soong resolves all dependencies
Bug: 37512442
Change-Id: Ib789212cb88d55731397c600d132e7c672c0d8be
2017-11-03 16:30:28 +00:00
Edwin Wong
c1512b4577 Add tests to validate key length for clearkey plugin. am: cc77a50e96 am: 01802815eb am: 36c9c34bdb
am: d29bc78ec9

Change-Id: Idbae7b29df1f71b331a13d31e47de925bceb4514
2017-11-03 05:46:59 +00:00
Edwin Wong
d29bc78ec9 Add tests to validate key length for clearkey plugin. am: cc77a50e96 am: 01802815eb
am: 36c9c34bdb

Change-Id: Ibb92aa618ceec88721ed807819d31516ab70595c
2017-11-03 05:44:56 +00:00
Edwin Wong
36c9c34bdb Add tests to validate key length for clearkey plugin. am: cc77a50e96
am: 01802815eb

Change-Id: I298891316951cc6ba5f000b796fb60c0b4f76290
2017-11-03 05:42:54 +00:00
Edwin Wong
01802815eb Add tests to validate key length for clearkey plugin.
am: cc77a50e96

Change-Id: Id61b8d76ef30a6c66edd10cd48b4ecdad795165d
2017-11-03 05:40:23 +00:00
Sooraj Sasindran
8c77e2b7dc Merge "vts test for 1.2" am: 55e7774568 am: b0034bf5b9
am: 20ad34f084

Change-Id: Ia17ca32195c90b6e5b36abe25af82ad26117ec18
2017-11-03 00:39:34 +00:00
Sooraj Sasindran
20ad34f084 Merge "vts test for 1.2" am: 55e7774568
am: b0034bf5b9

Change-Id: Ic9e887d9a021f7e2dc32b8e7d1c12e733e38f456
2017-11-03 00:37:33 +00:00
Sooraj Sasindran
b0034bf5b9 Merge "vts test for 1.2"
am: 55e7774568

Change-Id: I1c45e47a0fc14bb9f15f3f998c5a3419f5be69fb
2017-11-03 00:36:04 +00:00
Sooraj Sasindran
55e7774568 Merge "vts test for 1.2" 2017-11-03 00:32:21 +00:00
Steven Moreland
cc75a2a6d4 resolve merge conflicts of dd5206c57 to oc-mr1-dev-plus-aosp
am: 726af41e68

Change-Id: I25b8cd589c96f67b3e10f219e0bf251557a5c4be
2017-11-02 22:50:21 +00:00
Steven Moreland
71f26bf5cc dumpstate mk -> bp
Test: compilation finds dependencies
Bug: 37512442
Change-Id: Ib207c2163a07dea03c096283d10b00af966a1728
2017-11-02 15:25:59 -07:00
Edwin Wong
cc77a50e96 Add tests to validate key length for clearkey plugin.
AesCtrDecryptor::decrypt() doesn't check whether the size of "key"  is
equal to 16 bytes,  which may lead to an OOB read problem in the context
of mediadrmserver. The fix is in clearkey plugin. Add tests to validate
the fix.

Test: VTS test
  adb shell /data/nativetest/VtsHalDrmV1_0TargetTest/VtsHalDrmV1_0TargetTest

bug: 63982768

Merged-In: Ife2da17e7f39d8031bc36b83c3b27ba5e9d83eb7
Change-Id: Ife2da17e7f39d8031bc36b83c3b27ba5e9d83eb7
2017-11-02 14:46:43 -07:00
Sooraj Sasindran
4547419e6c vts test for 1.2
Add VTS test for 1.2 interface

Test: verfied the test with a dummy radio service

Bug:67750232
Change-Id: Ieac680a303c79a9d4c8b314112121303b3aebcce
2017-11-02 14:44:57 -07:00
Steven Moreland
726af41e68 resolve merge conflicts of dd5206c57 to oc-mr1-dev-plus-aosp
This version of configstore was removed internally.

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I589addff6aec7bb7a8a7938d75c51dcc56116a42
2017-11-02 20:59:39 +00:00
Steven Moreland
dd5206c57c Merge "Update makefiles after AOSP push."
am: 9d4c21f9af

Change-Id: I00acd9f3e8bdb7894268f1e7a405e449e27d0085
2017-11-02 20:45:16 +00:00
Treehugger Robot
9d4c21f9af Merge "Update makefiles after AOSP push." 2017-11-02 20:39:30 +00:00
Steven Moreland
db3c6b747f Merge "Remove unnecessary Android.mk" am: 7052f3d45d am: 6993933fc6
am: 0d6bbbcc1e

Change-Id: I23bd6e6751db2aac43904e7aa0c0d9c6661a96d1
2017-11-02 04:26:19 +00:00
Steven Moreland
0d6bbbcc1e Merge "Remove unnecessary Android.mk" am: 7052f3d45d
am: 6993933fc6

Change-Id: Id4f1fcb632a25a7a44b04c44eacd3f089cd1e8ca
2017-11-02 04:24:48 +00:00
Steven Moreland
6993933fc6 Merge "Remove unnecessary Android.mk"
am: 7052f3d45d

Change-Id: I0acf1c73d3b8ad5d949ba96d11e65fcf703b8423
2017-11-02 04:23:18 +00:00
Treehugger Robot
7052f3d45d Merge "Remove unnecessary Android.mk" 2017-11-02 04:18:28 +00:00