Commit Graph

3988 Commits

Author SHA1 Message Date
Treehugger Robot
ceceb459e0 Merge "Add @Nullable for getSubscriptionIds" 2018-10-22 21:12:56 +00:00
Chen Xu
6730f34590 Merge "NWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType" 2018-10-22 17:30:16 +00:00
Chen Xu
e09f7b5ebb Merge "Need to check empty not null for String" 2018-10-22 16:53:18 +00:00
Chen Xu
fccdf46adf Merge changes from topic "carrier_id_aosp_cp"
* changes:
  support mno carrier id
  support privilege access rule for carrier identification
2018-10-22 16:36:25 +00:00
chen xu
f513b528bd NWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType
Bug: 117954963
Test: telephony unit test
Change-Id: I3e31955992de63f7002cbfd7b91ec408b2ff7b75
2018-10-21 14:29:53 -07:00
chen xu
6d4f5b2280 support mno carrier id
Bug: 110559381
Test: CarrierResolverTest.testMnoCarrierId
Change-Id: Ifa1f69fc98b5a7034f28fb5690981087cd6c135a
Merged-in: Ifa1f69fc98b5a7034f28fb5690981087cd6c135a
2018-10-20 22:25:10 -07:00
fionaxu
e9c6da7b12 support privilege access rule for carrier identification
Bug: 69807697
Bug: 72665237
Test: Manual
Change-Id: I5e00302684b2be93ee956d43b04ca9a12d043158
Merged-in: I5e00302684b2be93ee956d43b04ca9a12d043158
2018-10-20 22:22:18 -07:00
sqian
f8ace214fb Add @Nullable for getSubscriptionIds
Bug: 117930253
Test: Treehugger
Change-Id: Ia24bd84bb93380473b9b5a2153b52538e86229db
2018-10-19 19:01:42 -07:00
Brad Ebinger
7fff7e5eff Merge "Expose the empty MmTelCapabilities constructor" 2018-10-19 20:20:14 +00: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
a18e095754 Merge "Revert "Telephony light grey list clean up for Q"" 2018-10-19 18:36:56 +00: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
bab59cb9db Revert "Telephony light grey list clean up for Q"
This reverts commit 253bdb7175.

Reason for revert: This CL caused MMS break because Bugle is using the
hidden API in Q's darkgrey list. The proper fix should either come from
Bugle team if their apk moved to Q, or compat team to explore why this
caused issue for app target on P.

Change-Id: Icc6c190cde79c10d9045183c0b80cdf008e95578

Bug: 117899984
2018-10-19 18:05:32 +00:00
Chen Xu
f2e0f57976 Merge "expose some Telephony.Carriers cols system APIs" 2018-10-19 17:56:14 +00:00
Seongho Kim
77680bd4db Need to check empty not null for String
getWcdmaLevel needs to check empty string, which is currently doesn't
because mWcdmaDefaultSignalMeasurement could be not null but empty string.

Test: TelephonybaseTest

Change-Id: If00a5953eef972250266ceef234cce213d45bc6a
Signed-off-by: Seongho Kim <sh_tiger.kim@samsung.com>
2018-10-19 02:40:08 +00: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
SongFerngWang
7e7c7d2abf add four new carrier configs for supplementary service precautions.
The carrier configs control the supplementary service precautions for
call forwarding ,call barring ,caller id ,and call waiting .

Bug: 80404623
Test: Build pass

Change-Id: I5fbe9734dbb092b25fd145344c7559d2dee79df2
2018-10-18 16:59:49 -07: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
Hall Liu
0c9254ee66 Merge "Add dynamic support for 4G/LTE/LTE+ icons" 2018-10-18 20:36:06 +00: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
Brad Ebinger
4133a00a10 Merge "Expose ImsExternalCallState constructor as @SystemApi" 2018-10-18 16:54:38 +00: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
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
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
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
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
6bd29ab2df Merge "refactor data/voice roaming states" 2018-10-12 18:02:17 +00: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
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
Treehugger Robot
bb9f855faa Merge "getTelephonyProperty returns defaultVal" 2018-10-11 20:30:17 +00: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
Treehugger Robot
0d954557a1 Merge "Fix incorrect javadoc links" 2018-10-10 23:23:53 +00: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
Treehugger Robot
b7b19312f0 Merge "Fixed the indentation" 2018-10-10 01:05:26 +00: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