Commit Graph

20349 Commits

Author SHA1 Message Date
Hall Liu
19c6fd5ab1 Merge "Add test API to override carrier config" am: a82f952fe7
am: 657e2a925d

Change-Id: Ic93a7e349e412c84d2c3752d9fe1911e42c08ceb
2018-10-24 16:33:18 -07:00
Nathan Harold
7695b94e10 Merge "Add getMobileNetworkOperator to CellIdentityTdscdma" am: ac87c0a884
am: 8dc36336d5

Change-Id: Ic7d0e0bc7c52a6689fb88e27f5f6d5aa6c75869e
2018-10-24 16:28:49 -07:00
Tyler Gunn
db0e0f8c57 Merge "Re-add removed APIs per API council feedback." am: a94a71af13
am: 7085118cfc

Change-Id: Idecba0bbaed7b05dc02ec86788268bc8b945963a
2018-10-24 16:09:16 -07:00
Hall Liu
a82f952fe7 Merge "Add test API to override carrier config" 2018-10-24 00:00:22 +00:00
Nathan Harold
ac87c0a884 Merge "Add getMobileNetworkOperator to CellIdentityTdscdma" 2018-10-23 23:34:26 +00:00
Hall Liu
e5b1fda883 Add test API to override carrier config
Add API surface and AIDL to enable override functionality for CTS

Change-Id: I55328a75f16fe91280530dd348d4a034694be6e9
Fixes: 118184943
Test: manually call api through shell cmd
2018-10-23 13:14:36 -07:00
Nathan Harold
d285c8eb20 Add getMobileNetworkOperator to CellIdentityTdscdma
For consistency with CellIdentityLte, Wcdma, and Gsm
adding this function. It will aid in future refactors
to possibly create a common interface for these classes.

Bug: 111808089
Test: compilation
Change-Id: Ia6b21bcc368089d8346951ae9476e7eb12a05130
2018-10-22 15:31:08 -07:00
Tyler Gunn
1c285f0ac2 Re-add removed APIs per API council feedback.
Some APIs were removed erroneously in the Q release; these methods were
just deprecated in Q,

Test: Make API, build
Bug: 116801893
Change-Id: I38ddf8bcd9fe39f4ba50bc892ac2f6d20209f7a9
2018-10-22 14:26:19 -07:00
Brad Ebinger
6984c36cc0 Merge "Expose the empty MmTelCapabilities constructor" am: 7fff7e5eff
am: 4e63b90a3b

Change-Id: Iad80098eda2635ea490929e3bab84e7575b08c59
2018-10-19 13:54:58 -07:00
chen xu
7f3258ac83 Merge "correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED" am: 2c10a29eaa
am: fd6cccc775

Change-Id: I45f482ad6b57cc3ff7c5f125f5f98f748f54063c
2018-10-19 13:26:32 -07:00
Brad Ebinger
7fff7e5eff Merge "Expose the empty MmTelCapabilities constructor" 2018-10-19 20:20:14 +00:00
Chen Xu
39f0965925 Merge "new SystemAPI for setCarrierDataEnabled" am: 7dd38c2115
am: 6ec00c2584

Change-Id: I83fa3369a48b9cc6bfe962f2ae101f06709793ae
2018-10-19 13:16:05 -07:00
Treehugger Robot
2c10a29eaa Merge "correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED" 2018-10-19 19:19:26 +00:00
Chen Xu
7dd38c2115 Merge "new SystemAPI for setCarrierDataEnabled" 2018-10-19 18:47:27 +00:00
Chen Xu
76819cc048 Merge "expose some Telephony.Carriers cols system APIs" am: f2e0f57976
am: bb0689b6d5

Change-Id: I39fa9903ca0b3709fe420f80cfa0a3ae32a28537
2018-10-19 11:29:43 -07:00
chen xu
b591f9d2dd correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED
keep the value same as master

Bug: 117930373
Test: telephony unit test
Change-Id: I0bad21eeed2b4667fbb781253828b99332103b31
Merged-in: Id170063bfdb1e3325f67e8680231ab4deda7d65d
2018-10-19 18:18:39 +00:00
Chen Xu
f2e0f57976 Merge "expose some Telephony.Carriers cols system APIs" 2018-10-19 17:56:14 +00:00
taiki tsutsumi
7bb40b5909 Add CarrierConfig to hide "Network default" option in Caller ID setting
am: 187c9943ff

Change-Id: I46132178c349ad5b914fd498f6985ef7988b9060
2018-10-19 10:51:09 -07:00
Youming Ye
c4b647458c Merge changes from topic "cherrypick"
* changes:
  Add CarrierConfig to hide "Network default" option in Caller ID setting
  add four new carrier configs for supplementary service precautions.
2018-10-19 16:33:22 +00:00
Junyu Lai
70626e3b94 Merge "Add new callback to inform blocking of network on specific uid." am: f709e754ab
am: 745952eac8

Change-Id: I24b45f860992626968a6adfb0ff6b6389c85cf45
2018-10-19 09:26:39 -07:00
Junyu Lai
f709e754ab Merge "Add new callback to inform blocking of network on specific uid." 2018-10-19 15:20:48 +00:00
sqian
9545440334 Merge "Fix current.txt" am: 2810d0ae3e
am: 26c2c5e50d

Change-Id: I9717d3c4d084498a1b1b23aa0639bc28721ccda1
2018-10-19 00:00:26 -07:00
taiki tsutsumi
187c9943ff Add CarrierConfig to hide "Network default" option in Caller ID setting
Add a key to hide "Network default". When value is false,
"Network default" shouldn't be displayed for options in Caller ID
setting.

Test: manual - check options in Caller ID setting
Bug: 111809829
Change-Id: Id07ab2d2281a1ebb07d631045ada705cda53daf2
Merged-In: I5fbe9734dbb092b25fd145344c7559d2dee79df2
2018-10-19 01:12:39 +00:00
chen xu
3d59fdb70d new SystemAPI for setCarrierDataEnabled
Bug: 116138716
Test: Telephony unit test
Change-Id: I6fba04dab8fd067f49b17afa2a640b7d00092a3f
Merged-in: I6fba04dab8fd067f49b17afa2a640b7d00092a3f
2018-10-18 15:32:48 -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
Brad Ebinger
4db427a5a8 Expose the empty MmTelCapabilities constructor
1) Allow for empty MmTelFeature.MmTelCapabilities to be
accessible via @SystemApi.
2) Add correct @nonnull/@nullable annotations as per API
review.

Bug: 117555643
Bug: 116117215
Test: Manual
Change-Id: Id445e4702f44528b4b1ab59129cf35803ae70053
2018-10-18 12:29:58 -07:00
sqian
c62bb2d69c Fix current.txt
Bug: 113072551
Test: compile
Change-Id: I3e9d5ec0460eae13da88671e1e7cb873638352ee
Merged-In: I00720bc3f947adf3c1072c75a040e85333d317f5
2018-10-18 19:00:36 +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
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
chen xu
851004813a expose some Telephony.Carriers cols system APIs
Bug: 117473154
Test: Telephony unit test

Change-Id: I8e6b873842f42b8cb3244a14b6e6c5d9c1ae5318
2018-10-17 13:30:57 -07: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
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
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
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
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
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
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
junyulai
05986c638b Add new callback to inform blocking of network on specific uid.
Currently, apps rely on querying NetworkInfo object to know
whether their network is blocked or not. There is no proactive
way to tell app when it is being blocked/unblocked. The only
event that app would receive is SocketException with
ECONNABORTED when their ongoing socket connection has been
blocked, which is not an elegant way to notify app.

Thus, this commit is trying to address this problem. Therefore,
with the uses of other callbacks, the need of
getState/getDetailedState in NetworkInfo could be completely
eliminated.

Test: runtest frameworks-net
      runtest -x NetworkPolicyManagerServiceTest.java
      cts-tradefed run cts -m CtsHostsideNetworkTests
      cts-tradefed run cts -m CtsNetTestCases -t \
              android.net.cts.ConnectivityManagerTest
Bug: 74575553

Change-Id: Iec96a3103d0aa9a505020eb89d69b89c0b694486
2018-10-11 16:31:10 +08:00