Commit Graph

4132 Commits

Author SHA1 Message Date
Hall Liu
13d2b5f1ab Merge "Add dynamic support for 4G/LTE/LTE+ icons" am: 0c9254ee66
am: 5bd6b4d570

Change-Id: Ib0c30a20063087de7e336d01675f83de0aa64c7d
2018-10-18 15:30:11 -07:00
Brad Ebinger
aa2e73d8a5 Merge "Expose ImsExternalCallState constructor as @SystemApi" am: 4133a00a10
am: 8e5a756f9d

Change-Id: Icc899e3da0472a9409856e51d1bd8f02074431ad
2018-10-18 15:24:51 -07:00
Hall Liu
0c9254ee66 Merge "Add dynamic support for 4G/LTE/LTE+ icons" 2018-10-18 20:36:06 +00:00
Brad Ebinger
4133a00a10 Merge "Expose ImsExternalCallState constructor as @SystemApi" 2018-10-18 16:54:38 +00:00
Shuo Qian
8b1a350056 Merge "Compare Emergency number display priority" am: a9d551ca7b
am: 1f36225eaf

Change-Id: Ie177f4fda621f5415f236bae305731ebcf7c34fe
2018-10-18 08:39:48 -07:00
Hall Liu
3cdba1092b Merge "Add new carrier configs for RTT" am: c6b2c9df68
am: bbaf7644b2

Change-Id: Icdaa952d20034f9295c96023677d29f953594a98
2018-10-18 08:26:51 -07:00
Jack Yu
7413496e2c Merge "Supported v1.3 data profile" am: 1e4f6fbe23
am: 405ea01c54

Change-Id: Ia6737beb1fda5a01159a9ed52e5e26976744b9ab
2018-10-18 07:52:24 -07:00
Roland Levillain
9426e28727 resolve merge conflicts of acbcff9e7d to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: 117349311
Change-Id: I1d07e5d6e749bd96cf322dd77422d6401233f081
2018-10-18 14:18:17 +01:00
Shuo Qian
a9d551ca7b Merge "Compare Emergency number display priority" 2018-10-17 22:12:02 +00:00
Hall Liu
c6b2c9df68 Merge "Add new carrier configs for RTT" 2018-10-17 19:58:53 +00:00
Brad Ebinger
9a6c675da2 Expose ImsExternalCallState constructor as @SystemApi
1) Expose the ImsExternalCallState constructor as @SystemApi
so that vendors can use this class correctly.
2) Change the call ID from int->String to comply with RFC 4235.

Bug: 117555643
Bug: 115697579
Test: Manual
Change-Id: I980ec091c69d2b3179843bd8485955377b88712e
2018-10-17 10:18:47 -07:00
Jack Yu
1e4f6fbe23 Merge "Supported v1.3 data profile" 2018-10-17 15:56:41 +00:00
Chen Xu
354fc35005 Merge "refactor radioPowerstate" 2018-10-17 04:10:47 +00:00
Shuo Qian
59c8b87ad4 Merge "Make SubscriptionManager.getSlotIndex public" am: 719310cd2c
am: a781751b32

Change-Id: Ib7d3dd0f7ce06edf736c493cde6778365c366ae2
2018-10-16 18:06:09 -07:00
Shuo Qian
719310cd2c Merge "Make SubscriptionManager.getSlotIndex public" 2018-10-17 00:37:35 +00:00
sqian
5660149817 Compare Emergency number display priority
Define the rules for emergency numbers that may have higher display
priority, and make Emergency number comparable for these values. This
is also essential for sorting the list so that an emergency number with
higher display priority should be listed in a lower index.

Test: Treehugger, unit test
Bug: 112657134
Change-Id: I46fb009ce862ec3c593a05b4b04e180faf198fc4
2018-10-16 14:44:53 -07:00
Jack Yu
72e3077715 Supported v1.3 data profile
1. Supported IRadio v1.3 data profile.
2. Do not send data profile list when the list is empty.
3. Only set profile id when the data profile must persist on the
   modem.

Test: Manual and unit tests
Bug: 73659459

Change-Id: I1414b5346cec1d617f7093c3761dbd77fe594a8b
2018-10-16 14:21:58 -07:00
Nathan Harold
cd3d9a5ba9 Move SDK Check for getNeighboringCellInfo
am: cb1c5ad25d

Change-Id: I5f840dfa0f002e3d1b43426840a38221f02a10c2
2018-10-16 10:33:34 -07:00
Nathan Harold
9ec58ff433 Merge "Move SDK Check for getNeighboringCellInfo" 2018-10-16 16:50:22 +00:00
Nathan Harold
cb1c5ad25d Move SDK Check for getNeighboringCellInfo
Move the SDK check for getNeighboringCellInfo() to
inside the phone process for security.

Bug: 117520186
Test: atest CtsPermissionTestCasesSdk28
Change-Id: I9ca059dad0ed5d2107af154e0a63c282133aba3d
2018-10-15 20:15:51 -07:00
chen xu
760729c33e refactor radioPowerstate
1. new System API for getRadioPowerState with permision check
2. new System API for onRadioPowerStateChanged in PhoneStateListener
3. replace radioState enum in CommandsInterface to telephonyMgr defined
int.

Bug: 117349311
Test: telephony unit test
Change-Id: I502568280fbf9213ca6bf1f7fb204d0d4ce86580
Merged-in: I502568280fbf9213ca6bf1f7fb204d0d4ce86580
2018-10-15 16:56:04 -07:00
chen xu
6ea046e734 Merge "Telephony light grey list clean up for Q" am: b9749f750f
am: 700b5c3062

Change-Id: I22775147345a2c2159f18c49a94ec7e9d2a314a3
2018-10-15 16:02:42 -07:00
sqian
996a318e8d Make SubscriptionManager.getSlotIndex public
- Make public
- Improved the documentation
- Rename subId to subscriptionId
- Make INVALID_SIM_SLOT_INDEX public

Test: Treehugger
Bug: 113072551
Change-Id: I61376966868f62db841ffd1b9c8ac045054e2207
Merged-In: I61376966868f62db841ffd1b9c8ac045054e2207
2018-10-15 17:30:22 +00:00
chen xu
253bdb7175 Telephony light grey list clean up for Q
Bug: 112477300
Test: Telehony unit test
Change-Id: I5229224fe9a65b3647a42070f287e23f67084bda
Merged-in: I5229224fe9a65b3647a42070f287e23f67084bda
2018-10-15 10:19:43 -07:00
Chen Xu
6169b04385 Merge "refactor data/voice roaming states" am: 6bd29ab2df
am: 652ec06948

Change-Id: I1f82195e5477401f3216db92bbdac388bbe16c7f
2018-10-12 11:32:19 -07:00
Chen Xu
6bd29ab2df Merge "refactor data/voice roaming states" 2018-10-12 18:02:17 +00:00
Nan Zhang
ae15939492 Merge "Fix incorrect javadoc link" am: 293ab4941b
am: d96fe8ddd0

Change-Id: I0331d98eb989ee429eb0ef38c448eae551130118
2018-10-11 23:16:13 -07:00
Treehugger Robot
293ab4941b Merge "Fix incorrect javadoc link" 2018-10-12 04:26:49 +00:00
Nan Zhang
6c288efb4d Fix incorrect javadoc link
Test: m -j docs with -lerror enabled for frameworks/base docs.
Bug: b/116163454
Change-Id: I02a164b676397dd2d9e8a52ae344c1033b1a4029
2018-10-11 16:44:28 -07:00
Sooraj Sasindran
e3630c858a Merge "Introduce AlternativeNetwork APIs" am: 98966bcbb6
am: 10211c1f68

Change-Id: Idb3a45b52567451df01afef5e4131a6426b487dc
2018-10-11 16:28:54 -07:00
Sooraj Sasindran
98966bcbb6 Merge "Introduce AlternativeNetwork APIs" 2018-10-11 22:58:32 +00:00
chen xu
0281169e6d refactor data/voice roaming states
1. migrate set/get roamingType from ServiceState to
NetworkRegState.set/get roamingType
2. migrate set/get roamingStateFromRegstate from ServiceState
to NetworkRegState.regState
3. new System API for neworkRegistration.isRoaming().

Bug: 116127096
Test: ServiceStateTest, ServiceStateProviderTest

Change-Id: Ib89744089c98713819c8d313240d629ddb77d0bf
2018-10-11 15:10:32 -07:00
Jordan Liu
c3f2df9d6b Merge "getTelephonyProperty returns defaultVal" am: bb9f855faa
am: ca854cc2b9

Change-Id: I6774ef18f185f35344bef3bf42ab5addf23ea03a
2018-10-11 14:12:55 -07:00
Treehugger Robot
bb9f855faa Merge "getTelephonyProperty returns defaultVal" 2018-10-11 20:30:17 +00:00
Chen Xu
809d60067d Merge "Create URI for individual user settings in SIMINFO" am: cb90628990
am: 2c0e41694e

Change-Id: I2108c6a70ed49b74754de445e9b3f89a5ee083e0
2018-10-11 11:46:29 -07:00
Chen Xu
cb90628990 Merge "Create URI for individual user settings in SIMINFO" 2018-10-11 18:19:12 +00:00
Sooraj Sasindran
32e446bf00 Introduce AlternativeNetwork APIs
Introduce AlternativeNetwork APIs

Bug: 113106744
Test: Verified using test app to make api calls
Change-Id: I134d1aef40f014378fd1364e0bfec6926fe2093e
Merged-In: I7f470cd6028a12cc66a660d58720f803271d38eb
2018-10-11 16:45:08 +00:00
Tor Norbye
f2183961a9 Merge "Fix incorrect javadoc links" am: 0d954557a1
am: cd1c75ae4c

Change-Id: I6d8c44be9d156ac2b6a20d3d13972371ee4d741e
2018-10-10 17:20:42 -07:00
Treehugger Robot
0d954557a1 Merge "Fix incorrect javadoc links" 2018-10-10 23:23:53 +00:00
Yangster
8f842fae06 Merge "Phone service state change atom." am: 419fc89b52
am: 16e3399902

Change-Id: Ifbff53d3b113c527975b5509289600f734dcca7b
2018-10-10 15:53:35 -07:00
Treehugger Robot
419fc89b52 Merge "Phone service state change atom." 2018-10-10 19:51:36 +00:00
Yangster
4ccebeadc7 Phone service state change atom.
Background: BatteryStatsService tracks the phone scanning time metric. In Q,
we are migrating the dumpsys-based collection to the new infra. This CL is to
instrument the new logging mechanism.

Test: statsd test
FIX: b/116748990

Change-Id: I3cf5e0026bfc6f594c5f7b524f14b3a43b702afb
2018-10-10 19:45:10 +00:00
Xiangyu/Malcolm Chen
b4e0645657 Merge "Add VisibleForTesting to create TelephonyRegistryTest." am: fb96aac216
am: e7af7977cf

Change-Id: I8b1ad47627836972dc96230da040d8996c543d59
2018-10-09 18:14:08 -07:00
Treehugger Robot
b7b19312f0 Merge "Fixed the indentation" 2018-10-10 01:05:26 +00:00
Xiangyu/Malcolm Chen
e7af7977cf Merge "Add VisibleForTesting to create TelephonyRegistryTest."
am: fb96aac216

Change-Id: Ib18e4d3a2caf16f5523ec7413e892cdce18e6a06
2018-10-09 18:00:03 -07:00
Hall Liu
86fec032ec Add new carrier configs for RTT
Add new carrier config values for RTT that may differ based on which
operations each carrier supports.

Bug: 117350231
Test: compiles
Change-Id: I0b74fb41f7f0c13116355f6cddba0327f98ac1d4
2018-10-09 16:33:45 -07:00
Jack Yu
84897e23fb Fixed the indentation
Test: Build
Change-Id: Id8a30734c1e4607b0396e0a985ab46502d8723b9
2018-10-09 16:24:23 -07:00
Malcolm Chen
800a7d6dbf Add VisibleForTesting to create TelephonyRegistryTest.
Bug: 113305153
Test: unittest
Change-Id: Ie59b2da76fbc813ce011d4d0ab3ff533a6006e14
Merged-In: Ie59b2da76fbc813ce011d4d0ab3ff533a6006e14
2018-10-09 14:50:20 -07:00
Xiangyu/Malcolm Chen
4b61b0bdf1 Merge "More descriptions on SubscriptionController#setPreferredData" am: 16fcd3dcff
am: 247f18f47a

Change-Id: Id25f73dc5a0bd91c78f3822d31a6b37f7b488d5c
2018-10-09 11:54:25 -07:00
Xiangyu/Malcolm Chen
247f18f47a Merge "More descriptions on SubscriptionController#setPreferredData"
am: 16fcd3dcff

Change-Id: I33f2ee636be99c3cfba706dc581415881b5f11c3
2018-10-09 11:40:35 -07:00