Commit graph

17158 commits

Author SHA1 Message Date
David Gross
3bb5f650bb Merge ""successful preparation means successful execution" guarantee neglects bad operation inputs" 2019-09-12 18:44:33 +00:00
Robert Shih
60b836b0e8 Merge "[automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe am: 756f134fcc am: f6e7c9ed25 -s ours am: fe72b76df1 -s ours am: 5cfbc4ba16 am: 7063ed4b46 am: 3a65eb77da" into qt-qpr1-dev-plus-aosp
am: 562e4f15b5 -s ours
am skip reason: subject contains skip directive

Change-Id: I69020a812baac1b89309ce2c9cfe5734be9cb22e
2019-09-11 21:55:56 -07:00
Robert Shih
7f4dfda4e1 [automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe am: 756f134fcc am: f6e7c9ed25 -s ours am: fe72b76df1 -s ours am: 5cfbc4ba16 am: 7063ed4b46 am: 8afe496239
am: d98e70a042 -s ours
am skip reason: subject contains skip directive

Change-Id: If94f68abdc99f8aab732321c8f56e2340bdf1a7c
2019-09-11 21:55:15 -07:00
Android Build Merger (Role)
562e4f15b5 Merge "[automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe am: 756f134fcc am: f6e7c9ed25 -s ours am: fe72b76df1 -s ours am: 5cfbc4ba16 am: 7063ed4b46 am: 3a65eb77da" into qt-qpr1-dev-plus-aosp 2019-09-12 04:49:27 +00:00
Robert Shih
d2cd9dd56b [automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe am: 756f134fcc am: f6e7c9ed25 -s ours am: fe72b76df1 -s ours am: 5cfbc4ba16 am: 7063ed4b46
am: 3a65eb77da

Change-Id: Ic94ed9a6380f5b42bd881977b5136d839e8ed1ba
2019-09-11 21:49:15 -07:00
Robert Shih
d98e70a042 [automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe am: 756f134fcc am: f6e7c9ed25 -s ours am: fe72b76df1 -s ours am: 5cfbc4ba16 am: 7063ed4b46
am: 8afe496239

Change-Id: Ib8e855c412b7f967e79688873cf21fa15ff5e823
2019-09-11 21:49:14 -07:00
Robert Shih
9055c96749 default hidl CryptoPlugin: security fixes am: 1e18883b72 am: 02ef6a6283 am: 4d3b73ee5e am: 103efe8c40
am: f2d491e4fa

Change-Id: I662b2771a91c05c2b9690ddc250c01ef137ae485
2019-09-11 21:44:15 -07:00
Robert Shih
8afe496239 [automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe am: 756f134fcc am: f6e7c9ed25 -s ours am: fe72b76df1 -s ours am: 5cfbc4ba16
am: 7063ed4b46

Change-Id: I1ba4d33ea39a1c8f93e6dc2c19c1d00761d8a07b
2019-09-11 21:43:14 -07:00
Robert Shih
08089ef366 default hidl CryptoPlugin: security fixes am: 1e18883b72 am: 02ef6a6283 am: 4d3b73ee5e am: c1d79c8182
am: d056adc919

Change-Id: I47441e3d5eaa2091ff0f36a1a21edd60bbc8832d
2019-09-11 21:43:14 -07:00
Robert Shih
3a65eb77da [automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe am: 756f134fcc am: f6e7c9ed25 -s ours am: fe72b76df1 -s ours am: 5cfbc4ba16
am: 7063ed4b46

Change-Id: Ic83ce8ebc2e4b8fa1950189921024eeca967d0c9
2019-09-11 21:43:13 -07:00
Robert Shih
f2d491e4fa default hidl CryptoPlugin: security fixes am: 1e18883b72 am: 02ef6a6283 am: 4d3b73ee5e
am: 103efe8c40

Change-Id: I6cb7d309ef25497991de625d50f14ae1008c2073
2019-09-11 21:38:12 -07:00
Robert Shih
7063ed4b46 [automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe am: 756f134fcc am: f6e7c9ed25 -s ours am: fe72b76df1 -s ours
am: 5cfbc4ba16

Change-Id: I73333d50cf52fd9e9a2a429587d78ebc85dd82fe
2019-09-11 21:37:14 -07:00
Robert Shih
d056adc919 default hidl CryptoPlugin: security fixes am: 1e18883b72 am: 02ef6a6283 am: 4d3b73ee5e
am: c1d79c8182

Change-Id: Ib2cc45a2f430e8bdc1cdeab430b37b69a565709f
2019-09-11 21:37:12 -07:00
Robert Shih
c1d79c8182 default hidl CryptoPlugin: security fixes am: 1e18883b72 am: 02ef6a6283
am: 4d3b73ee5e

Change-Id: I9a6dea5a04e2119954936501913d073c0d781bac
2019-09-11 21:32:09 -07:00
Robert Shih
103efe8c40 default hidl CryptoPlugin: security fixes am: 1e18883b72 am: 02ef6a6283
am: 4d3b73ee5e

Change-Id: I984dbf4463f731bced310342b5763a14ad0cdc4d
2019-09-11 21:30:09 -07:00
Robert Shih
5cfbc4ba16 [automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe am: 756f134fcc am: f6e7c9ed25 -s ours
am: fe72b76df1 -s ours
am skip reason: subject contains skip directive

Change-Id: I29ffdf3a7520a251d28502514f1f5b1ba44520ae
2019-09-11 21:30:08 -07:00
Robert Shih
4d3b73ee5e default hidl CryptoPlugin: security fixes am: 1e18883b72
am: 02ef6a6283

Change-Id: I19a3ea993f954db12008af47d0f14f97962d92fb
2019-09-11 21:23:06 -07:00
Robert Shih
fe72b76df1 [automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe am: 756f134fcc
am: f6e7c9ed25 -s ours
am skip reason: subject contains skip directive

Change-Id: I526b0d9b4c77ffcf144788317ff78ec431c97405
2019-09-11 21:23:04 -07:00
Robert Shih
f6e7c9ed25 default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe
am: 756f134fcc

Change-Id: I4289e38c6eab3e8cac9e489a08f74b3efcf008f9
2019-09-11 21:18:04 -07:00
Robert Shih
756f134fcc default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE]
am: d22f1447fe

Change-Id: I480b83a0c4ffd752637ff5357b30d6f5c1916b4b
2019-09-11 21:10:00 -07:00
Robert Shih
02ef6a6283 default hidl CryptoPlugin: security fixes
am: 1e18883b72

Change-Id: Ifbbc3cf6c827085046259365808d962ad192c55a
2019-09-11 21:09:00 -07:00
Xin Li
3abe362a55 [automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: 7b2e2fe15c -s ours am: 5848abafed -s ours
am: fdd973f54d -s ours
am skip reason: change_id Ibbd540dbb5baee46360d3fe9469212cfd8f550ba with SHA1 f7b2330d86 is in history

Change-Id: Id2de7d470b7482309cb2f4e1098e4fb8e14d5673
2019-09-11 17:15:30 -07:00
Xin Li
fdd973f54d [automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: 7b2e2fe15c -s ours
am: 5848abafed -s ours
am skip reason: change_id Ibbd540dbb5baee46360d3fe9469212cfd8f550ba with SHA1 f7b2330d86 is in history

Change-Id: If3ed050ac1769d28bfa64b21557c727e149bcaaa
2019-09-11 15:58:29 -07:00
Xin Li
5848abafed [automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master
am: 7b2e2fe15c -s ours
am skip reason: change_id Ibbd540dbb5baee46360d3fe9469212cfd8f550ba with SHA1 f7b2330d86 is in history

Change-Id: I0ab1111fb9895f53deacd723e2131c88057e488b
2019-09-11 15:52:39 -07:00
Xin Li
3cca1e63b9 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 15be13ea71 -s ours am: 2697cb4659 -s ours
am: ca1401075c -s ours
am skip reason: change_id Ibbd540dbb5baee46360d3fe9469212cfd8f550ba with SHA1 f7b2330d86 is in history

Change-Id: I6c3d2f321cd2dd4a72778eb493d5434ea83bf1ee
2019-09-11 15:43:47 -07:00
Robert Shih
d22f1447fe default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE]
* reject native handle output for clearkey
* validate subsample sizes

Bug: 137370777
Test: cryptopoc
Change-Id: I2a81f2a00ebf7954b16fb10d2af586ce0da801ed
2019-09-11 22:08:28 +00:00
Robert Shih
1e18883b72 default hidl CryptoPlugin: security fixes
* reject native handle output for clearkey
* validate subsample sizes

Bug: 137370777
Test: cryptopoc
Change-Id: Idf075e1a297fe1ab3ea3e1621806dd46b4a51e35
2019-09-11 22:08:19 +00:00
Xin Li
ca1401075c [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 15be13ea71 -s ours
am: 2697cb4659 -s ours
am skip reason: change_id Ibbd540dbb5baee46360d3fe9469212cfd8f550ba with SHA1 f7b2330d86 is in history

Change-Id: Ie4e5e96b6d9e6c74b941afe82d8ae28557c534a9
2019-09-11 14:52:04 -07:00
Xin Li
2697cb4659 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 15be13ea71 -s ours
am skip reason: change_id Ibbd540dbb5baee46360d3fe9469212cfd8f550ba with SHA1 f7b2330d86 is in history

Change-Id: I530bcab2183ed178f8d6ac596abc63889765f704
2019-09-11 14:04:19 -07:00
TreeHugger Robot
7b2e2fe15c Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master 2019-09-11 20:31:38 +00:00
Stan Rokita
bc78e537f5 Merge changes If9065255,I7d07003e
* changes:
  MultiHal 2.0 - activate, batch, flush methods of HalProxy
  MultiHal 2.0 - proxying api calls helper methods
2019-09-11 20:22:24 +00:00
Michael Butler
d6b5b1e29b [automerger skipped] Merge "Consolidate NNAPI VTS utility code" am: 71cb010ba3 am: 672607596f am: 59e0f264f5
am: 8c06c1cb41 -s ours
am skip reason: change_id Ic401bb1f1760cc10384ac0d30c0c93409b63a9c7 with SHA1 e16af0a44b is in history

Change-Id: Ib445978c1cf021964aad2591865df87752fdb2a3
2019-09-11 13:15:36 -07:00
Michael Butler
8c06c1cb41 Merge "Consolidate NNAPI VTS utility code" am: 71cb010ba3 am: 672607596f
am: 59e0f264f5

Change-Id: Idb8a6f5ee4307754a790394e8868857927c334d1
2019-09-11 12:50:28 -07:00
Michael Butler
59e0f264f5 Merge "Consolidate NNAPI VTS utility code" am: 71cb010ba3
am: 672607596f

Change-Id: Ia5c2c6af241430e700731b8b2de6f668a7778f76
2019-09-11 12:37:04 -07:00
Michael Butler
672607596f Merge "Consolidate NNAPI VTS utility code"
am: 71cb010ba3

Change-Id: I5bcbe8135d6ecef5f263a46e2b382976d077f87f
2019-09-11 12:30:04 -07:00
Michael Butler
71cb010ba3 Merge "Consolidate NNAPI VTS utility code" 2019-09-11 19:03:06 +00:00
Michael Butler
13b0516e56 Consolidate NNAPI VTS utility code
This CL does additional NNAPI VTS test cleanup, including consolidating
duplicate functionality. Specifically, this CL:
* consolidates the createPreparedModel function, removing the duplicate
* consolidates the std::out ErrorStatus and DeviceStatus code into Utils
* changes non-null constant pointers to constant references
* removes redudant leading namespace specifiers (V1_0::, ::testing, etc.)
* makes the Valdiation tests free functions
* renames device to kDevice and mTestModel to kTestModel

Bug: N/A
Test: mma
Test: VtsHalNeuralnetworksV1_*TargetTest (with sample-all)
Change-Id: Ic401bb1f1760cc10384ac0d30c0c93409b63a9c7
Merged-In: Ic401bb1f1760cc10384ac0d30c0c93409b63a9c7
(cherry picked from commit e16af0a44b)
2019-09-11 11:04:54 -07:00
Stan Rokita
4b4c7b744d MultiHal 2.0 - activate, batch, flush methods of HalProxy
These three methods of HalProxy simply call the apropriate ISensors
methods of the subhal pointed to by sensorHandle.

Test: Loaded onto device and observed no crashing.
Bug: 136511617
Change-Id: If90652554ea18c22b24aead0074ab9847eae0a4f
2019-09-11 07:43:22 -07:00
Stan Rokita
1638531dfb MultiHal 2.0 - proxying api calls helper methods
Create getSubHalForSensorHandle method which will get the proper subhal
pointer by getting the subhal list index from the first byte of the
sensor handle. Create the zeroOutFirstByte static helper method that
will return a version of the sensor handle without the first byte when
passed a handle.

Test: Tested compilation.
Bug: 136511617
Change-Id: I7d07003e1903aa1d8abaf904b778248c7b352653
2019-09-11 07:43:20 -07:00
Colin Cross
48ebf35e72 Remove unused libcrypto dependency. am: 5d81a5814b am: 84633dea30 am: 45cd136049
am: 8e32fe8353

Change-Id: Iafcc1beff7a517712d4430d7efdd833707f8b6d7
2019-09-10 18:16:20 -07:00
Colin Cross
8e32fe8353 Remove unused libcrypto dependency. am: 5d81a5814b am: 84633dea30
am: 45cd136049

Change-Id: Ia05067cc53f4dbda169aa3b8ce29e5903c4c1942
2019-09-10 18:09:14 -07:00
Colin Cross
45cd136049 Remove unused libcrypto dependency. am: 5d81a5814b
am: 84633dea30

Change-Id: I660b0423d97e6402de84be904e0e84c6763518a3
2019-09-10 18:02:04 -07:00
Colin Cross
84633dea30 Remove unused libcrypto dependency.
am: 5d81a5814b

Change-Id: I57e56bcbb1c8cb0e7a437da9694ace9eae981eea
2019-09-10 17:55:35 -07:00
Pete Bentley
d909580269 Remove unused libcrypto dependency.
libcrypto is unused, which causes problems when boringssl hash
injection is turned on as the code is all stripped and there is
nothing left to inject the hash into.

See http://r.android.com/1117291 for the AOSP change to related
modules.

Bug: 137267623
Test: croot hardware/interfaces/wifi && mma
Change-Id: I9d002c0b723cf9a04ee64641b5281e65912595c8
2019-09-10 17:21:04 +01:00
Pawin Vongmasa
2c4fceb442 Merge "[automerger skipped] OMX VTS: Move device resource files to data/local/tmp am: 8799bcc740 am: d660d03f7c am: 099b914599 am: d86c5a905a -s ours am: 222d825ea0 -s ours am: 955548eec1 -s ours am: 84cd010990 -s ours am: 0be2a64b31 -s ours
am: 60da8c8238 -s ours
am skip reason: change_id I824b84ef8570ba501cf8137d695f98c335f92c7b with SHA1 8799bcc740 is in history

Change-Id: I13b09ba9628fb0b1b96e64ba7528276c5bd84fab
2019-09-09 22:25:04 -07:00
Pawin Vongmasa
a2b3438f86 [automerger skipped] OMX VTS: Move device resource files to data/local/tmp am: 8799bcc740 am: d660d03f7c am: 099b914599 am: d86c5a905a -s ours am: 222d825ea0 -s ours am: 955548eec1 -s ours am: 84cd010990 -s ours am: 521f845b17 -s ours
am: c649401110 -s ours
am skip reason: change_id I824b84ef8570ba501cf8137d695f98c335f92c7b with SHA1 a54bf6ed5a is in history

Change-Id: Ie149a75a683a89a0896d1cc3a74650d2fdd97bb5
2019-09-09 22:24:40 -07:00
Android Build Merger (Role)
60da8c8238 Merge "[automerger skipped] OMX VTS: Move device resource files to data/local/tmp am: 8799bcc740 am: d660d03f7c am: 099b914599 am: d86c5a905a -s ours am: 222d825ea0 -s ours am: 955548eec1 -s ours am: 84cd010990 -s ours am: 0be2a64b31 -s ours am skip reason: change_id I824b84ef8570ba501cf8137d695f98c335f92c7b with SHA1 a54bf6ed5a is in history" into qt-qpr1-dev-plus-aosp 2019-09-10 05:18:41 +00:00
Pawin Vongmasa
bd83b50e9e [automerger skipped] OMX VTS: Move device resource files to data/local/tmp am: 8799bcc740 am: d660d03f7c am: 099b914599 am: d86c5a905a -s ours am: 222d825ea0 -s ours am: 955548eec1 -s ours am: 84cd010990 -s ours
am: 0be2a64b31 -s ours
am skip reason: change_id I824b84ef8570ba501cf8137d695f98c335f92c7b with SHA1 a54bf6ed5a is in history

Change-Id: Ic90e9eab3a54f190464913e3db86d026638a7d24
2019-09-09 22:18:28 -07:00
Pawin Vongmasa
c649401110 [automerger skipped] OMX VTS: Move device resource files to data/local/tmp am: 8799bcc740 am: d660d03f7c am: 099b914599 am: d86c5a905a -s ours am: 222d825ea0 -s ours am: 955548eec1 -s ours am: 84cd010990 -s ours
am: 521f845b17 -s ours
am skip reason: change_id I824b84ef8570ba501cf8137d695f98c335f92c7b with SHA1 a54bf6ed5a is in history

Change-Id: I2d81b850298df3b6d481259d59e5f80dbd576a16
2019-09-09 22:18:21 -07:00
Pawin Vongmasa
521f845b17 [automerger skipped] OMX VTS: Move device resource files to data/local/tmp am: 8799bcc740 am: d660d03f7c am: 099b914599 am: d86c5a905a -s ours am: 222d825ea0 -s ours am: 955548eec1 -s ours
am: 84cd010990 -s ours
am skip reason: change_id I824b84ef8570ba501cf8137d695f98c335f92c7b with SHA1 a54bf6ed5a is in history

Change-Id: Id92992e51accd6a7e1e606837d3b925cc1526a49
2019-09-09 22:11:44 -07:00