| commit | 0a1670ab158b999569972ffc5a0269d20520c4f3 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Apr 15 00:44:49 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Apr 15 00:44:49 2020 +0000 |
| tree | 5b7cdb9e63d3e2936d409af113c32f391a355f99 | |
| parent | 9c898802ed27f0e3b14392c475eff9b5aceab9b5 [diff] | |
| parent | 15351dcf60179cc23d126f7699a0832276acd2ea [diff] |
Merge "Use <fqname> to avoid conflicts"
diff --git a/trusty/keymaster/4.0/android.hardware.keymaster@4.0-service.trusty.xml b/trusty/keymaster/4.0/android.hardware.keymaster@4.0-service.trusty.xml index aa30707..65eb854 100644 --- a/trusty/keymaster/4.0/android.hardware.keymaster@4.0-service.trusty.xml +++ b/trusty/keymaster/4.0/android.hardware.keymaster@4.0-service.trusty.xml
@@ -2,10 +2,6 @@ <hal format="hidl"> <name>android.hardware.keymaster</name> <transport>hwbinder</transport> - <version>4.0</version> - <interface> - <name>IKeymasterDevice</name> - <instance>default</instance> - </interface> + <fqname>@4.0::IKeymasterDevice/default</fqname> </hal> </manifest>