Jack Yu
7400a47396
Merge "Added nullable callback support" am: 35520445be am: 19f9299af6
...
am: 0659e60b98
2018-01-27 03:51:00 +00:00
Jack Yu
0659e60b98
Merge "Added nullable callback support" am: 35520445be
...
am: 19f9299af6
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
Jack Yu
de45fc4720
Merge "Renamed Result to ResultCode" am: 093ab1dc61 am: ce29c3ecbd
...
am: 40045aee45
2018-01-27 01:08:33 +00:00
Jack Yu
40045aee45
Merge "Renamed Result to ResultCode" am: 093ab1dc61
...
am: ce29c3ecbd
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
2018-01-26 22:14:21 +00:00
Jack Yu
da1f3a566a
Merge "Added slot id in the internal API" am: 045ff781b9
...
am: 5674b8e119
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
2018-01-26 03:44:10 +00:00
Xiangyu/Malcolm Chen
bf960e0fd8
Merge "Add Voice / Data network specific reg states." am: ffdbbc533c
...
am: e5932b56bc
2018-01-26 03:37:01 +00: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
2018-01-25 22:21:13 +00:00
Holly Jiuyu Sun
d19ef3fa1b
Merge "Fill in methods in EuiccCardController." am: 197f072da2
...
am: d143bb628a
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
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
2018-01-25 16:05:05 +00:00
Eric Schwarzenbach
79f2ea2d7d
Merge "Add ServiceState APIs for carrier aggregation." am: 185a89caf1 am: d529242eea
...
am: a0414ed567
2018-01-25 15:51:19 +00:00
Eric Schwarzenbach
55373d0549
Merge "Update CellInfo API to accomodate new fields." am: 7e73c73f89
...
am: 4dac182030
2018-01-25 15:49:59 +00:00
Malcolm Chen
58b90eb578
Merge "Add slotId in INetworkService.aidl methods." am: b1c6aa4567 am: 9348e258cd
...
am: 6ec70f018e
2018-01-25 15:30:37 +00:00
Eric Schwarzenbach
a0414ed567
Merge "Add ServiceState APIs for carrier aggregation." am: 185a89caf1
...
am: d529242eea
2018-01-25 15:23:48 +00:00
Malcolm Chen
6ec70f018e
Merge "Add slotId in INetworkService.aidl methods." am: b1c6aa4567
...
am: 9348e258cd
2018-01-25 15:19:06 +00:00
Treehugger Robot
7e73c73f89
Merge "Update CellInfo API to accomodate new fields."
2018-01-25 12:50:37 +00:00
TreeHugger Robot
9543d6eb65
Merge changes from topic "sms_ready"
...
* changes:
Unhide SMS over IMS APIs
Add and trigger onReady API for SMS over IMS.
2018-01-25 12:11:34 +00:00
Treehugger Robot
185a89caf1
Merge "Add ServiceState APIs for carrier aggregation."
2018-01-25 07:47:55 +00:00
Eric Schwarzenbach
a9d9b021be
Update CellInfo API to accomodate new fields.
...
Adds CellConnectionStatus to top level CellInfo type. Adds cell bandwidth
to the CellIdentityLte.
Bug: 72117223
Test: runtest frameworks-telephony
Change-Id: Id5f3b5a2bd4119c099f5e739d5579974e7adc897
2018-01-25 07:25:04 +00:00
Treehugger Robot
b1c6aa4567
Merge "Add slotId in INetworkService.aidl methods."
2018-01-25 07:13:17 +00:00
Jun Yin
c949502b95
Merge "Adds stripTrailingFs" am: 27bb333e14 am: a91491a3b8
...
am: 76e05493b4
2018-01-25 03:42:45 +00:00
Jun Yin
76e05493b4
Merge "Adds stripTrailingFs" am: 27bb333e14
...
am: a91491a3b8
2018-01-25 03:34:13 +00:00
Amit Mahajan
9399343f42
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED." am: 7b9a785d65 am: e2075c2c7d
...
am: fd8df8236f
2018-01-25 03:29:29 +00:00
Amit Mahajan
fd8df8236f
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED." am: 7b9a785d65
...
am: e2075c2c7d
2018-01-25 02:59:04 +00:00
Mohamed Abdalkader
9cb476bb10
Unhide SMS over IMS APIs
...
While here add more constants for send sms result.
Test: manual
BUG:69846044
Change-Id: I66fdcff51dc5ded9f6199d09bb667c89f38b6d59
2018-01-25 02:52:43 +00:00
Treehugger Robot
27bb333e14
Merge "Adds stripTrailingFs"
2018-01-25 02:44:26 +00:00
Holly Jiuyu Sun
321977a191
Fill in methods in EuiccCardController.
...
Add RESULT_UNKNOWN in EuiccCardManager.
Bug: 38206971
Test: test on phone
Change-Id: I972ba0ab5ff6bb8e6ef50c8684a19bb9cd48a721
2018-01-24 18:22:21 -08:00
Malcolm Chen
d272880c90
Add slotId in INetworkService.aidl methods.
...
Since one Service can only return same binder to all connected
clients, we add slotId in INetworkService.aidl methods to redirect
requests to correct provider.
Bug: 64132030
Test: build
Change-Id: Iae5d81a689a43ed783d7dff0f51735c42a6483be
2018-01-25 01:37:59 +00:00
Eric Schwarzenbach
09a7773583
Add ServiceState APIs for carrier aggregation.
...
Adds getDuplexMode, getChannelNumber, and getCellBandwidths to
ServiceState.
Bug: 72117602
Test: runtest
Change-Id: I04be7d0a7d88693ef21b252ecc21aa974c2f89c8
2018-01-25 01:10:29 +00:00
Nathan Harold
1e39ade047
Merge changes from topic "keepalive-on-cell"
...
* changes:
Rework KeepalivePacketData for Compatibility with Cell
Add Constants for NATT Keepalive to RILConstants
Relocate KeepalivePacketData to frameworks/base
2018-01-25 00:48:43 +00:00
Holly Jiuyu Sun
047707c7aa
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: ec44a402d2 am: 596c22a84d
...
am: 07b212b788
2018-01-24 23:37:16 +00:00
Holly Jiuyu Sun
07b212b788
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: ec44a402d2
...
am: 596c22a84d
2018-01-24 23:24:29 +00:00
Mohamed Abdalkader
bddbd624ec
Add and trigger onReady API for SMS over IMS.
...
Test: manual test that normal code path is fine since this code path is
not yet exercisable.
BUG=69846044
Change-Id: Icb15ca4aa6606fba641f6270dca5e0e06fc4466a
2018-01-24 15:07:24 -08:00
Android Build Merger (Role)
9f1dd93b2a
Merge "Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am: 7a481bde6d am: f343e33dd5 am: e39de15109"
2018-01-24 22:39:45 +00:00
Tyler Gunn
c3f129c795
Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am: 7a481bde6d am: f343e33dd5
...
am: e39de15109
2018-01-24 22:38:52 +00:00
Android Build Merger (Role)
71df9bf176
Merge "Merge "Added network service interface" am: 71793be6bb am: 2b06789511 am: 3748d15321"
2018-01-24 22:33:21 +00:00
Xiangyu/Malcolm Chen
7783ecd755
Merge "Added network service interface" am: 71793be6bb am: 2b06789511
...
am: 3748d15321
2018-01-24 22:32:56 +00:00
Amit Mahajan
8a4275f09f
Update comments for ACTION_CARRIER_CONFIG_CHANGED.
...
Test: none
Bug: 64131518
Change-Id: I7efbbb393289cc11d529898ea3d7f96b0e89f445
2018-01-24 14:30:38 -08:00
Holly Jiuyu Sun
ec44a402d2
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."""
2018-01-24 21:11:07 +00:00
Tyler Gunn
e39de15109
Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am: 7a481bde6d
...
am: f343e33dd5
2018-01-24 21:06:48 +00:00
