Commit Graph

6801 Commits

Author SHA1 Message Date
Brad Ebinger
a1474266bf Merge "ImsSsData needs a public constructor for vendors to use" 2018-10-24 17:08:39 +00:00
Youming Ye
94fe6430ea Merge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting"" 2018-10-24 16:26:21 +00:00
Tony Zhu
ee31b2214d Merge "[Call Screening]Support for carrier call screening app" 2018-10-24 15:51:48 +00: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
Nathan Harold
c65e610c06 Merge "Remove Hidden TimestampType From CellInfo" 2018-10-23 22:02:15 +00:00
Brad Ebinger
4123f9587d ImsSsData needs a public constructor for vendors to use
Expose Builder for IMS Supp Service APIs as well as clean
up some of the ambiguous int[] usage.

Bug: 117555643
Test: Manual
Change-Id: I5cad08e0a032f4e38a62ac033c01111319cf9fd5
2018-10-23 14:57:59 -07:00
Nathan Harold
f5cf9f24ed Merge "Move some members to the "Q blacklist"." 2018-10-23 21:53:51 +00:00
Tyler Gunn
a94a71af13 Merge "Re-add removed APIs per API council feedback." 2018-10-23 20:49:43 +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
Xiangyu/Malcolm Chen
0875fbab4b Merge "Add PhoneStateListener#onPreferredDataSubIdChanged" 2018-10-23 17:03:22 +00:00
Brad Ebinger
a993f6d76f Merge "Adds new Public ImsManager API" 2018-10-23 16:50:04 +00:00
Nathan Harold
eb8e831c95 Remove Hidden TimestampType From CellInfo
The timestamp type in CellInfo was added as an
experiment when CellInfo was first created. There
was optimism that highly precise timestamps would
be useful and available; however, in practice no
vendors are known to support precise timestamps
from the modem. Having a consistent timestap that
has a reference source available to apps is more
valuable than this flexibility. Thus, the reference
will always be nanotime since Android system boot,
and the timestamps will always be stamped by the
Android framework when the records are retrieved
from the modem.

Bug: 36971551
Test: atest FrameworksTelephonyTests

Change-Id: Ic5340b6c03ddc36aa00e7694c85b3af27128652e
2018-10-22 17:41:17 -07:00
Mathew Inwood
45d2c252b1 Move some members to the "Q blacklist".
Based on some analysis, these fields/methods are likely false positives.
Set maxTargetSdk=P so that any apps using them are required to migrate off
them in future. See the bug for more details.

Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 115609023
Test: m
Merged-In: I719b5c94e5b1f4fa562dd5d655953422958ad37e
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
(cherry picked from commit 8c854f86a4)
2018-10-22 17:28:24 -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
Treehugger Robot
ceceb459e0 Merge "Add @Nullable for getSubscriptionIds" 2018-10-22 21:12:56 +00:00
Malcolm Chen
c1873af9c5 Add PhoneStateListener#onPreferredDataSubIdChanged
When SubscriptionManager#SetPreferredData changes preferredDataSub,
SubscriptionController notifies TelephonyRegistry and then notifies
all PhoneStateListeners that listen to the event.

Bug: 115550764
Test: unittest
Change-Id: Icb0b349b9f07a52d7d9c5e8512f731986f1a1fa3
Merged-In: Icb0b349b9f07a52d7d9c5e8512f731986f1a1fa3
2018-10-22 13:51:09 -07:00
Brad Ebinger
c5992534ed Adds new Public ImsManager API
Exposes IMS functionality using new ImsManager API.

Bug: 116493310
Bug: 112538960
Bug: 112866475
Test: Telephony Unit Tests
Merged-In: I856fd7edd7a8b6085567ae6de12340f9086a4903
Change-Id: I856fd7edd7a8b6085567ae6de12340f9086a4903
2018-10-22 13:11:02 -07: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
Youming Ye
cbd0cca984 Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting"
This reverts commit 187c9943ff.

Reason for revert: Slipped off master. Revert and try put it back.

Change-Id: I5823566523346c943c14e91848e7d5de9c14d68d
2018-10-19 21:34:27 +00:00
Bill Yi
04d53e2611 Merge "Merge pi-dr1-dev to aosp-master" 2018-10-19 21:19:30 +00:00
Brad Ebinger
7fff7e5eff Merge "Expose the empty MmTelCapabilities constructor" 2018-10-19 20:20:14 +00:00
Bill Yi
0b537c73f7 Merge pi-dr1-dev to aosp-master
Change-Id: I40fca8b785049f8563809a70f6671b8af89f3cfd
2018-10-19 12:20:31 -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
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
bb0689b6d5 Merge "expose some Telephony.Carriers cols system APIs"
am: f2e0f57976

Change-Id: Ifbceb368352aa1f57912b6690f61fe8412e2dc41
2018-10-19 11:13:04 -07: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
Youming Ye
130aacd566 Merge changes from topic "cherrypick"
am: c4b647458c

Change-Id: Id372458d932eb34db2f7cdc5bc25159f65f1d93c
2018-10-19 10:15:55 -07:00
SongFerngWang
dd86ea6036 add four new carrier configs for supplementary service precautions.
am: 7e7c7d2abf

Change-Id: If9d738a3c9632410dc913ed08109b975e90b36a2
2018-10-19 10:08:46 -07: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
5bd6b4d570 Merge "Add dynamic support for 4G/LTE/LTE+ icons"
am: 0c9254ee66

Change-Id: Ie5841b4e86231517f724948389ff2b819d8245ad
2018-10-18 14:56:21 -07:00
Brad Ebinger
8e5a756f9d Merge "Expose ImsExternalCallState constructor as @SystemApi"
am: 4133a00a10

Change-Id: Ic1245b146735f33ec679a83eb7dd228b4aeb3178
2018-10-18 14:52:24 -07:00
Xiangyu/Malcolm Chen
325b3aea77 Merge "Define EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE in DctConstants"
am: 1b59a1673a

Change-Id: I15c450d9ca7a71bfbde1ddd602e13473bede06b3
2018-10-18 14:21:29 -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
Xiangyu/Malcolm Chen
1b59a1673a Merge "Define EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE in DctConstants" 2018-10-18 04:41:04 +00:00