Commit Graph

3100 Commits

Author SHA1 Message Date
Jack Yu
3224cd958c Merge "Used the better hash method provided by Objects" am: 262f84699e am: e9642cdb50
am: 91737fac7a

Change-Id: I1bfba282b275a036c90482fd44bfe382de49f851
2018-01-31 10:44:59 +00:00
Jack Yu
91737fac7a Merge "Used the better hash method provided by Objects" am: 262f84699e
am: e9642cdb50

Change-Id: I843b74fae7c6c8b937236755793d6739600e7643
2018-01-31 10:35:49 +00:00
Treehugger Robot
262f84699e Merge "Used the better hash method provided by Objects" 2018-01-31 09:04:52 +00:00
nharold
d21e8d8b7b Merge "Remove getIsimChallengeResponse" am: b6d5a85a9c am: c13ddc2fe0
am: e69ef2e511

Change-Id: I4117e88b3c6360d9b6c542f53826bef612572700
2018-01-31 02:18:53 +00:00
nharold
e69ef2e511 Merge "Remove getIsimChallengeResponse" am: b6d5a85a9c
am: c13ddc2fe0

Change-Id: If67d532c0ab0cbd778650cd2a6bd33b91f0459e5
2018-01-31 01:59:39 +00:00
Holly Jiuyu Sun
bba3be6a5e Merge "Only allow LPA to select ISD-R using iccTransmitApduBasicChannel" am: 04e5e63305 am: 8b37eedfc9
am: 7c824e97b9

Change-Id: I33e427e9f34c90a742dd9c6e7cc2baf0bfad4825
2018-01-31 00:27:00 +00:00
nharold
b6d5a85a9c Merge "Remove getIsimChallengeResponse" 2018-01-31 00:23:50 +00:00
Holly Jiuyu Sun
7c824e97b9 Merge "Only allow LPA to select ISD-R using iccTransmitApduBasicChannel" am: 04e5e63305
am: 8b37eedfc9

Change-Id: I5ed1d2622cac57b527eb13ff752be44f606a1dc1
2018-01-31 00:18:23 +00:00
Nathan Harold
c6ee8d63eb Merge "Update Docstring for SmsMessage.getOriginatingAddress" am: 14513e0ea3
am: 79f3dcb694

Change-Id: I4b3369fb2a75234e9100630cc7a2ebf49855d722
2018-01-31 00:12:08 +00:00
Holly Jiuyu Sun
04e5e63305 Merge "Only allow LPA to select ISD-R using iccTransmitApduBasicChannel" 2018-01-30 23:05:00 +00:00
nharold
e397302a30 Merge "Update hashCode in CellSignalStrength classes" am: 59fec059a9 am: f148ec8b72
am: 7ec87ba8a6

Change-Id: Ib53ddcc9957810e50be46482c14e44f4ba4c7b74
2018-01-30 21:54:01 +00:00
nharold
7ec87ba8a6 Merge "Update hashCode in CellSignalStrength classes" am: 59fec059a9
am: f148ec8b72

Change-Id: I2038a5395a0917d13080d204f429c8847006edc5
2018-01-30 21:44:40 +00:00
Treehugger Robot
14513e0ea3 Merge "Update Docstring for SmsMessage.getOriginatingAddress" 2018-01-30 20:09:00 +00:00
Jack Yu
059aa39fab Used the better hash method provided by Objects
Test: Unit tests
Bug: 64132030
Change-Id: Ib0fa616b28df97caf5457fd9069fbd76a80b17cc
2018-01-30 12:02:27 -08:00
nharold
59fec059a9 Merge "Update hashCode in CellSignalStrength classes" 2018-01-30 19:52:36 +00:00
Nathan Harold
cf40a9ab81 Merge "Update Docstring for SmsMessage.getOriginatingAddress" 2018-01-30 18:00:10 +00:00
Brad Ebinger
98e3150570 Merge changes from topic "ims_imsservice_apis"
* changes:
  Modify ImsService API to accomodate compat
  Make ImsService API @SystemApi
  Integrate new MMTel APIs into the framework
  Integrate ImsCallSessionListener API changes
2018-01-30 16:19:42 +00:00
Nathan Harold
07f21cf510 Update Docstring for SmsMessage.getOriginatingAddress
There was a public request for clarification on the address
format for getOriginatingAddress. I did a little research and
have added the answer to the docstring.

Bug: 64697463
Test: compilation
Merged-In: Icf37af0a5940a6fb7798d7c7cafe7b97683bb689
Change-Id: Icf37af0a5940a6fb7798d7c7cafe7b97683bb689
2018-01-30 03:02:38 +00:00
Nathan Harold
36b1c16db5 Update Docstring for SmsMessage.getOriginatingAddress
There was a public request for clarification on the address
format for getOriginatingAddress. I did a little research and
have added the answer to the docstring.

Bug: 64697463
Test: compilation
Change-Id: Icf37af0a5940a6fb7798d7c7cafe7b97683bb689
2018-01-29 18:59:49 -08:00
Nathan Harold
017e7f90ee Update hashCode in CellSignalStrength classes
The CellSignalStrength hashCode function was using a
fairly ineffective method of hashing. An External
reporter requested that we fix it. This CL moves to
using the Objects.hash() implementation.

Bug: 22479413
Test: compilation
Change-Id: Ic017ba54ef757fd3ec3e5000ac61108dd836bd8a
2018-01-29 18:05:39 -08:00
Holly Jiuyu Sun
a8a0683a96 Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()" am: 67fb5370cd
am: bded9f969f

Change-Id: I704a78ae7330d1eefcfcecb6dfb8073d71cfe5ed
2018-01-30 00:28:21 +00:00
Chenjie Yu
00efc9c9f5 Merge "change bluetooth update to be cumulative value based" 2018-01-29 23:51:08 +00:00
Holly Jiuyu Sun
67fb5370cd Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()" 2018-01-29 23:47:11 +00:00
Nathan Harold
0c9937cb5c Remove getIsimChallengeResponse
Remove the obsolete getIsimChallengeResponse.
Anybody calling this method should use
getIccSimChallengeResponse instead.

Bug: 27954896
Test: compilation
Change-Id: I636825a448992e06dc11d4cd58dee750c38b2c5e
2018-01-29 13:30:58 -08:00
Jiyong Park
dc77bcee40 Remove SystemApi annotation from EuiccManager.getOtaStatus()
EuiccManager.getOtaStatus() has been annotated as @SystemApi, but its
declaring class EuiccManager has not. Therefore, the method hasn't been
recognized as SystemApi (does not appear in system-current.txt) and no
app is using the method.

This hasn't been harmful, but will soon trigger CTS failures when we do
the exact match for SystemAPIs; a runtime entity annotated as @SystemApi
have to exist in the documented API (e.g. system-current.txt). So
removing this no-op annotation.

Bug: 67891551
Test: m -j checkapi
Change-Id: I570ef5e5c88b6b9162116d3d3a7b17367efa9d7f
2018-01-29 13:09:29 -08:00
Jack Yu
7400a47396 Merge "Added nullable callback support" am: 35520445be am: 19f9299af6
am: 0659e60b98

Change-Id: I289b8cbb5bceab13c7684a2509e79e77828c07fd
2018-01-27 03:51:00 +00:00
Jack Yu
0659e60b98 Merge "Added nullable callback support" am: 35520445be
am: 19f9299af6

Change-Id: I1701893d61b9e459b0f22e0165d03f5efadfd56e
2018-01-27 03:42:06 +00:00
Treehugger Robot
35520445be Merge "Added nullable callback support" 2018-01-27 03:24:52 +00:00
Jack Yu
f00ff3c93b Added nullable callback support
Sometimes data service clients do not care the result of the
requests so they pass null callback. In this case the data service
should handle it.

Test: Manual
Bug: 64132030
Change-Id: Ib188994fed4e708de875a24d5386a74a8f6db4dd
2018-01-27 01:28:21 +00:00
Holly Jiuyu Sun
4f880138e4 Only allow LPA to select ISD-R using iccTransmitApduBasicChannel
Bug: 72561613
Test: test on phone
Change-Id: Ifae8c341dd41936a993c6202bc0c7d1c71b8d360
2018-01-26 17:16:14 -08:00
Jack Yu
de45fc4720 Merge "Renamed Result to ResultCode" am: 093ab1dc61 am: ce29c3ecbd
am: 40045aee45

Change-Id: Idaf26a3cb64871637e10f84fe492a7d5bd706e46
2018-01-27 01:08:33 +00:00
Jack Yu
40045aee45 Merge "Renamed Result to ResultCode" am: 093ab1dc61
am: ce29c3ecbd

Change-Id: I7c3b24d7ced5b2b7f468a03c2caf85f66e881301
2018-01-27 00:59:45 +00:00
Treehugger Robot
093ab1dc61 Merge "Renamed Result to ResultCode" 2018-01-27 00:39:37 +00:00
Jack Yu
01d2e132dc Merge "Added slot id in the internal API" am: 045ff781b9 am: 5674b8e119
am: da1f3a566a

Change-Id: I74871fd9c3630192efcce5bae68c2b34aeed7d45
2018-01-26 22:14:21 +00:00
Jack Yu
da1f3a566a Merge "Added slot id in the internal API" am: 045ff781b9
am: 5674b8e119

Change-Id: I12f2a0e8d75e593ac046368ee94d1f8d183d6ded
2018-01-26 22:06:17 +00:00
Jack Yu
045ff781b9 Merge "Added slot id in the internal API" 2018-01-26 19:25:13 +00:00
Jack Yu
b83cc78bfd Renamed Result to ResultCode
Test: Manual
Bug: 64132030
Change-Id: Idd49322186d1a60c9846cc205964f3b2e318c31a
2018-01-26 09:21:16 -08:00
TreeHugger Robot
b0db811fe9 Merge "Statsd and frameworks reference proto enums" 2018-01-26 05:02:35 +00:00
Xiangyu/Malcolm Chen
f86ed0160b Merge "Add Voice / Data network specific reg states." am: ffdbbc533c am: e5932b56bc
am: bf960e0fd8

Change-Id: I5b7198b261b70bfff233c904e4565f3000dc8c88
2018-01-26 03:44:10 +00:00
Xiangyu/Malcolm Chen
bf960e0fd8 Merge "Add Voice / Data network specific reg states." am: ffdbbc533c
am: e5932b56bc

Change-Id: I07c6aedf87c6800e9cce247b07aaf3d17162ea2b
2018-01-26 03:37:01 +00:00
Brad Ebinger
35d89ea6ac Modify ImsService API to accomodate compat
Modifies the ImsService API to accomodate
the ImsService compat layer for older
vender implementations

Bug: 63987047
Test: Manual, Telephony unit tests
Change-Id: Ifb2870414e3d80ef114b3c5fa00c5c5e1aa80b05
2018-01-25 17:40:03 -08:00
Bookatz
1a1b0464cb Statsd and frameworks reference proto enums
For frameworks constants that don't have intrinsic meaning (i.e. their actual
value and order don't matter), so that it is unlikely that their values
will be changed:
This cl introduces proto enums representing some constants found in
the Android codebase, and connects the two.

By using the Proto enum as the source-of-truth, it means that Java and
proto can be kept in sync. Otherwise, when the Java frameworks code
changes, it silently breaks the protos from working properly, since the enums
are wrong. By having the Java code reference the proto enums, it ensures
that everything is in sync. The values of the constants are unchanged.
But future changes to these constants will need to be done in the proto
file, which the Java file merely references.

The protos are necessary for incidentd and statsd and, in the future,
possibly dumpsys. In this way, the logging mechanism is much less likely
to get broken when new constants are added, and we can be ensured that
the logging accurately reflects the underlying codebase.

Bug: 69478930
Test: cts-tradefed run cts-dev -m CtsStatsdHostTestCases
Test: cts-tradefed run cts-dev -m CtsIncidentHostTestCases
Change-Id: If79032c34b2799db1e3e70cb47b1312fd72092b9
2018-01-25 15:47:57 -08:00
Holly Jiuyu Sun
078de80ba7 Merge "Fill in methods in EuiccCardController." am: 197f072da2 am: d143bb628a
am: d19ef3fa1b

Change-Id: I8189d3b34e4966c873e689c8c90ca6a8f2b2ec49
2018-01-25 22:21:13 +00:00
Brad Ebinger
f8c3cd8b35 Make ImsService API @SystemApi
Marks the ImsService API as @SystemAPI.

Bug: 63987047
Test: Build, Telephony unit tests
Change-Id: I10f8a09950be87cb166b718d1dcc2954fba872cb
2018-01-25 14:11:37 -08:00
Holly Jiuyu Sun
d19ef3fa1b Merge "Fill in methods in EuiccCardController." am: 197f072da2
am: d143bb628a

Change-Id: I327158452fb1fc341de7a31c9004aa757406d9bd
2018-01-25 22:06:08 +00:00
Malcolm Chen
4c01328d90 Add Voice / Data network specific reg states.
In NetworkRegistrationState.java, add hidden inner classes that
stores information specific to voice network registration state
and data network registration state.

Bug: 64132030
Test: build
Change-Id: I746be2a50cfa138acc5b2b40e38ab875ceab6d8d
2018-01-25 10:57:43 -08:00
Brad Ebinger
112c36d39f Integrate new MMTel APIs into the framework
Performs the bulk of the work of:
1) Moving the old MMTel APIs to a hidden
.compat namespace to support older vendor
versions of the code.

2) Replace the compat MMTel APIs with the
new ImsService APIs and integrate them
into existing code.

This is one of two CLs, this CL
integrates the new APIs, the next CL
creates the compat layer in telephony
to translate the .compat APIs to the new
APIs to allow Telephony to work with
older versions of the API.

Before commit, the corresponding vendor
changes will have to be submitted as well.

Bug: 63987047
Test: Telephony Unit tests
Change-Id: Icc9ecfdad000f42399beeac142083e62962c12d3
2018-01-25 10:51:27 -08:00
Brad Ebinger
264625486b Integrate ImsCallSessionListener API changes
Integrates the ImsCallSessionListener API changes.
This involves:

1) Moving the ImsCallSessionListener to the
android.telephony.ims namespace.
2) Creating a compat layer between the old
IImsCallSessionListener AIDL and the new one
for vendors using the old implementation.
3) Modify ImsCallSession to only use
setListener to set ImsCallSessionListener
(other method was never used in our code).

Test: Telephony Unit Tests, Manual IMS Tests
Bug: 63987047

Change-Id: I4378c0b1d68ff4f5f21815c81af52c03a66f81c5
2018-01-25 10:50:43 -08:00
Holly Jiuyu Sun
197f072da2 Merge "Fill in methods in EuiccCardController." 2018-01-25 17:22:50 +00:00
Eric Schwarzenbach
fd4881c53f Merge "Update CellInfo API to accomodate new fields." am: 7e73c73f89 am: 4dac182030
am: 55373d0549

Change-Id: I39620f4dd3afd57835c1c48e36e94f8028102edb
2018-01-25 16:05:05 +00:00