Commit graph

479 commits

Author SHA1 Message Date
Iris Chang
eddb1d9a01 Merge "VTS: fix RadioHidlTest.getAvailableNetworks issue" am: 89b2d24fb0 am: 0c9df89f88
am: 2d47467288

Change-Id: Id5ddb114f2a31d39d844409b4444fbd4ca77745e
2017-11-15 04:13:54 +00:00
Iris Chang
0c9df89f88 Merge "VTS: fix RadioHidlTest.getAvailableNetworks issue"
am: 89b2d24fb0

Change-Id: I96c5b3873c53fba6fca5905f0a5897a7f8801f4a
2017-11-15 04:10:23 +00:00
Treehugger Robot
89b2d24fb0 Merge "VTS: fix RadioHidlTest.getAvailableNetworks issue" 2017-11-15 04:06:29 +00:00
Xin Li
bb9e38fef9 Merge commit '1a06284b24f5eb7bb9c1fea0817da8898b3b1bff' from
oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: I2a044eb8c9981d0a8198ffe2df55559afbd76341
Merged-In: I4fb9f18884f7ef21162015a0032c4431444f7025
2017-11-14 12:08:38 -08:00
Iris Chang
6429f0677f VTS: fix RadioHidlTest.getAvailableNetworks issue
Analysis: VtsHalRadioV1_0Target's timeout is too short for
getAvailableNetworks, because this request duration depends on NW
environment or frequency.

Suggested solution: Add a timeout parameter to wait() and default
timeout value is 5 minutes in order to avoid timeout fail due to NW
environment.

Bug: 68834032
Test: getAvailableNetworks can be passed after we apply this patch and
      test result for all other telephony 1.0 and 1.1 test cases are not
      changed.
Change-Id: Iaae71e0abacd28275d86a19264813ff209ddb79c
2017-11-14 01:08:03 +00:00
sqian
e986b85fdd Modify VTS error check so that the error code can be displayed
- Add AssertionResult in gtest to display logs
- Refactor all the error checks

- Replace INTERNAL_ERR with INVALID_ARGUMENT for
requestIsimAuthentication

Bug: 63760809
Bug: 65150146
Test: run vts
Change-Id: Id3d876ea515f47998e3e45be11db5edf306ffc24
2017-11-13 15:16:04 -08:00
Shuo Qian
d416d3db6c Merge "Revert "Modify VTS error check so that the error code can be displayed"" 2017-11-13 22:20:42 +00:00
Shuo Qian
33b550ce67 Revert "Modify VTS error check so that the error code can be displayed"
This reverts commit cf243eba43.

Change-Id: Idd42b12cdcbaab1476e460c34f3b4b60c38dead0
2017-11-13 22:17:42 +00:00
Shuo Qian
f8d4081827 Merge "Modify VTS error check so that the error code can be displayed" 2017-11-13 21:17:12 +00:00
sqian
cf243eba43 Modify VTS error check so that the error code can be displayed
- Add AssertionResult in gtest to display logs
- Refactor all the error checks

- Replace INTERNAL_ERR with INVALID_ARGUMENT for 
requestIsimAuthentication

Bug: 63760809
Bug: 65150146
Test: run vts
Change-Id: Iec4bdfd89ccd8d8d8c6e1bd8f720a88d67f23cb3
2017-11-13 19:08:43 +00:00
Steven Moreland
8db261bc99 Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
2017-11-13 10:00:18 -08:00
Steven Moreland
a1169dd600 Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
2017-11-10 09:06:55 -08: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
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
Cassie
c80f43c37b Merge "Added CellIdentity struct in types.hal" am: 94a12051a3 am: c5f398daed
am: 1195c9b627

Change-Id: Ib311125c3fcb4a47e29eeceb929963ad8e50ba79
2017-11-01 23:27:15 +00:00
Cassie
1195c9b627 Merge "Added CellIdentity struct in types.hal" am: 94a12051a3
am: c5f398daed

Change-Id: I2140211e496d233018d64179203e25bbe6332fc5
2017-11-01 23:23:29 +00:00
Cassie
8c3011e5c7 Added CellIdentity struct in types.hal
This change was made because the new scan API needs to include the human
readable operator name other than PLMN in the scan results.
In order to let teh operator name used by other structures and APIS, we added
the operator name alphaLong and alphaShort, which were actually included
in the OperatorInfo, into the CellIdentity.

Bug: 63984327
Test: Basic telephony sanity
Change-Id: I498b7f190b739c92975fe797e1c74e96d90ee823
2017-11-01 10:25:36 -07:00
sqian
18192d9b83 Merge "Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts tests" into oc-mr1-dev am: b70f1bda1f
am: e99541ac02

Change-Id: Ic93e6a45afa6d4d5aff27a4d8f9e7b29ba9ae587
2017-10-18 03:43:37 +00:00
sqian
e99541ac02 Merge "Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts tests" into oc-mr1-dev
am: b70f1bda1f

Change-Id: Ie8c2ee83c5c6102658a2627099c097c3f155feaa
2017-10-18 03:40:37 +00:00
sqian
bc1c9295a3 Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts tests
Bug: 65230472
Test: run vts
Change-Id: I1fab6f49f04a04a7f1cd3b613fe7049f927171d1
2017-10-17 16:02:04 -07:00
Sooraj Sasindran
c496974404 Merge "Enhanced network scan request" am: 8e5f008ae6 am: b49cd63a75 am: cb1467f935
am: da47be9351

Change-Id: Ied661795a18352f805bedaaf0ac974ae006cbbb2
2017-10-17 08:48:59 +00:00
Sooraj Sasindran
da47be9351 Merge "Enhanced network scan request" am: 8e5f008ae6 am: b49cd63a75
am: cb1467f935

Change-Id: I2370bea69898bff71d366ca358574f4b3e5a21be
2017-10-17 06:29:41 +00:00
Sooraj Sasindran
b49cd63a75 Merge "Enhanced network scan request"
am: 8e5f008ae6

Change-Id: I8903402f50c64b475ccda3839f0175fb2eaa12f6
2017-10-17 06:11:13 +00:00
Sooraj Sasindran
55092ae5a6 Enhanced network scan request
Bug=63865942

Test: Verified by making changes in settings app to call the api
      and confirmed that the new information is delivered to verndor
      code

Change-Id: I38f5e88302268bdda7483f5bc96bf8a72b940208
2017-10-16 19:31:00 -07:00
sqian
336a914eb3 Refactor radio folder for 1.0 and 1.1 am: 8735a7d935
am: 2576f3505f

Change-Id: I999a8edb0cc1c37405cef6c20dcf5aaf262c4228
2017-10-15 01:54:55 +00:00
sqian
8735a7d935 Refactor radio folder for 1.0 and 1.1
Remove unused environment variable.

Test: run vts
Bug: 63760809
Change-Id: Iff7919980d7bbe0e9f8a73a3679d37426faec679
Merged-In: Iff7919980d7bbe0e9f8a73a3679d37426faec679
2017-10-13 10:36:04 -07:00
sqian
39866c92ff Refactor radio folder for 1.0 and 1.1
Remove unused environment variable.

Test: run vts
Bug: 63760809
Change-Id: Iff7919980d7bbe0e9f8a73a3679d37426faec679
Merged-In: Iff7919980d7bbe0e9f8a73a3679d37426faec679
2017-10-11 15:10:14 -07:00
Shuo Qian
2baeaec51c Merge "Refactor radio folder for 1.0 and 1.1" 2017-10-11 21:48:44 +00:00
sqian
4ae4325659 Refactor radio folder for 1.0 and 1.1
Remove unused environment variable.

Test: run vts
Bug: 63760809
Change-Id: Iff7919980d7bbe0e9f8a73a3679d37426faec679
2017-10-11 10:13:08 -07:00
Steven Moreland
1d7374c5e1 Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1 am: 6c811964a1
am: 116161d94e

Change-Id: I33643636e2511de77fdf7de57777eb67edee2e52
2017-10-11 16:39:21 +00:00
Steven Moreland
116161d94e Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1
am: 6c811964a1

Change-Id: I85ccbb4a15cd18938607f5bca4e065b9d7e0182b
2017-10-11 16:31:07 +00:00
Steven Moreland
0fff75dee1 Update for Soong java makefiles.
am: c3e80fa01e

Change-Id: Ia8835f9c95bd98a96f5fd3aff11191e7d3726fb9
2017-10-11 16:23:54 +00:00
Steven Moreland
c3e80fa01e Update for Soong java makefiles.
Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
2017-10-10 23:07:20 +00:00
Treehugger Robot
75d5cf515a Merge "Remove useless Android.mk files." 2017-10-05 21:40:27 +00:00
Steven Moreland
4b60470f1a Remove useless Android.mk files.
These have been c/p'd all over the place.

Test: m -j nothing
Bug: 33420795
Change-Id: I77979866dbb2345a41a873c84ec3fccd7b127510
2017-10-04 15:52:40 -07:00
Steven Moreland
70bfb9d250 Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f am: b53e6ad535
am: 9a17f41f6f

Change-Id: I78d9292068b372238554fd9d35128e69f5b5f9d2
2017-10-04 21:54:11 +00:00
Steven Moreland
9a17f41f6f Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f
am: b53e6ad535

Change-Id: I23269fb7a9bdd352e670a80f390527d9eef31412
2017-10-04 21:51:00 +00:00
Steven Moreland
861651985f Merge "Update for hidl adapter module defaults."
am: 988c977079

Change-Id: I289818be1b30397391847ba1c532d1014fdbed27
2017-10-04 21:45:09 +00:00
Treehugger Robot
988c977079 Merge "Update for hidl adapter module defaults." 2017-10-04 21:36:25 +00:00
Chih-hung Hsieh
bf5e381a8b Merge "Use -Werror in hardware/interfaces" am: 85bb01dd6b am: 3ed04cd35d am: baf19e17b3
am: 9890348480

Change-Id: Iadec8caae33b04a8cef45532fc2c940a8be23cea
2017-10-04 21:23:09 +00:00
Chih-hung Hsieh
9890348480 Merge "Use -Werror in hardware/interfaces" am: 85bb01dd6b am: 3ed04cd35d
am: baf19e17b3

Change-Id: I8806a9887178a7f778cc556c804a5b7a05d59836
2017-10-04 21:04:44 +00:00
Chih-hung Hsieh
3ed04cd35d Merge "Use -Werror in hardware/interfaces"
am: 85bb01dd6b

Change-Id: I9169eb99a256f3a1db9e6f82e11fd96228d9558a
2017-10-04 20:40:30 +00:00
Steven Moreland
527fd76a0e Update for hidl adapter module defaults.
Test: pass
Change-Id: Idc6a943149a279bf17cfcfd0f2571473e53bbbbf
2017-10-04 12:47:03 -07:00
Chih-Hung Hsieh
3da5b01946 Use -Werror in hardware/interfaces
* Remove unused local variables.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I48dbbf670cc9eeff2391983788983420f8547cc9
2017-10-04 11:16:31 -07:00
Steven Moreland
91799c6cc7 Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3 am: 71a193a425
am: 9fdd241905

Change-Id: I1c852fa6600fecc44d5afd1a65a5f51c43ecf71c
2017-09-27 00:02:52 +00:00
Steven Moreland
9fdd241905 Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3
am: 71a193a425

Change-Id: I45ae43f07323254212532acbf0f891d11143b05f
2017-09-26 23:58:51 +00:00
Steven Moreland
f07e364ce3 Merge "Fix typo in update makefiles."
am: 9960148420

Change-Id: I949634e72f817f3a5411130e968acd8efd1d7725
2017-09-26 23:51:07 +00:00
Steven Moreland
a5299ee739 Fix typo in update makefiles.
Bug: 37518178
Test: pass
Change-Id: Ic401b3a473f15ca4c01e58b3072e19db7c31b653
2017-09-26 21:59:43 +00:00
Steven Moreland
7741c0e17b Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e am: b94d0c7290
am: 97228c0b7d

Change-Id: Ic4b459b7c1a4325453945b0b00db8f44e4e77c26
2017-09-26 13:36:09 +00:00