Shuo Qian
12a2b2ec6d
Merge "Compare Emergency number display priority" am: a9d551ca7b am: 1f36225eaf
...
am: 8b1a350056
2018-10-18 09:55:24 -07:00
Hall Liu
57d933fc2c
Merge "Add new carrier configs for RTT" am: c6b2c9df68 am: bbaf7644b2
...
am: 3cdba1092b
2018-10-18 09:26:02 -07:00
Chen Xu
21c589aa66
Merge "support mno carrier id"
2018-10-18 16:00:35 +00:00
Shuo Qian
8b1a350056
Merge "Compare Emergency number display priority" am: a9d551ca7b
...
am: 1f36225eaf
2018-10-18 08:39:48 -07:00
Jack Yu
e4eab61e1a
Merge "Supported v1.3 data profile" am: 1e4f6fbe23 am: 405ea01c54
...
am: 7413496e2c
2018-10-18 08:33:01 -07:00
Hall Liu
3cdba1092b
Merge "Add new carrier configs for RTT" am: c6b2c9df68
...
am: bbaf7644b2
2018-10-18 08:26:51 -07:00
Jack Yu
7413496e2c
Merge "Supported v1.3 data profile" am: 1e4f6fbe23
...
am: 405ea01c54
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
chen xu
2e801e043e
support mno carrier id
...
Bug: 110559381
Test: CarrierResolverTest.testMnoCarrierId
Change-Id: Ifa1f69fc98b5a7034f28fb5690981087cd6c135a
2018-10-17 22:07:40 -07:00
Chen Xu
535b74527d
Merge "Revert "Revert "refactor radioPowerstate"""
2018-10-17 22:45:38 +00:00
Chen Xu
7395c630b0
Revert "Revert "refactor radioPowerstate""
...
This reverts commit 05188f3555
2018-10-17 22:45:21 +00: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
Jack Yu
1e4f6fbe23
Merge "Supported v1.3 data profile"
2018-10-17 15:56:41 +00:00
Przemyslaw Szczepaniak
7072da44cc
Merge "Revert "refactor radioPowerstate""
2018-10-17 11:04:14 +00:00
Przemyslaw Szczepaniak
05188f3555
Revert "refactor radioPowerstate"
...
This reverts commit 700c8a0389
2018-10-17 11:00:01 +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
2018-10-16 18:06:09 -07:00
Shuo Qian
719310cd2c
Merge "Make SubscriptionManager.getSlotIndex public"
2018-10-17 00:37:35 +00:00
Chen Xu
a7274eb9b2
Merge "refactor radioPowerstate"
2018-10-17 00:14:45 +00:00
TreeHugger Robot
ce5c43379f
Merge "Make SubscriptionManager.getSlotIndex public"
2018-10-16 23:07:29 +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
chen xu
700c8a0389
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
2018-10-16 20:33:28 +00:00
Nathan Harold
3e6be36806
Move SDK Check for getNeighboringCellInfo am: cb1c5ad25d
...
am: cd3d9a5ba9
2018-10-16 11:13:44 -07:00
Nathan Harold
cd3d9a5ba9
Move SDK Check for getNeighboringCellInfo
...
am: cb1c5ad25d
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
2018-10-15 16:02:42 -07:00
chen xu
e2592af979
Telephony light grey list clean up for Q
...
Bug: 112477300
Test: Telehony unit test
Change-Id: I5229224fe9a65b3647a42070f287e23f67084bda
2018-10-15 18:47:20 +00: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
sqian
e29d4a7f45
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
2018-10-12 20:51:22 -07:00
Chen Xu
2a670634e3
Merge "refactor data/voice roaming states" am: 6bd29ab2df am: 652ec06948
...
am: 6169b04385
2018-10-12 11:57:14 -07:00
Chen Xu
6169b04385
Merge "refactor data/voice roaming states" am: 6bd29ab2df
...
am: 652ec06948
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
ccc360e236
Merge "Fix incorrect javadoc link" am: 293ab4941b am: d96fe8ddd0
...
am: ae15939492
2018-10-11 23:33:24 -07:00
Nan Zhang
ae15939492
Merge "Fix incorrect javadoc link" am: 293ab4941b
...
am: d96fe8ddd0
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
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
524d6685a0
Merge "getTelephonyProperty returns defaultVal" am: bb9f855faa am: ca854cc2b9
...
am: c3f2df9d6b
2018-10-11 14:31:15 -07:00
Jordan Liu
c3f2df9d6b
Merge "getTelephonyProperty returns defaultVal" am: bb9f855faa
...
am: ca854cc2b9
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
0036c05f6c
Merge "Create URI for individual user settings in SIMINFO" am: cb90628990 am: 2c0e41694e
...
am: 809d60067d
2018-10-11 11:58:05 -07:00
Chen Xu
809d60067d
Merge "Create URI for individual user settings in SIMINFO" am: cb90628990
...
am: 2c0e41694e
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
