Brad Ebinger
bb6a3f4aab
Merge "Remove obsolete @VisibleForTesting Annotation" am: 1e8249a1d6 am: 2c8ace0794
...
am: eeb74b5312
2018-10-25 21:13:51 -07:00
Brad Ebinger
4b81463736
Merge "ImsSsData needs a public constructor for vendors to use" am: a1474266bf am: 207b9dcfbf
...
am: ee7267f8dd
2018-10-25 20:45:24 -07:00
Tony Zhu
065b19e137
Merge "[Call Screening]Support for carrier call screening app" am: ee31b2214d am: 3cde670dd3
...
am: 3403275a85
2018-10-25 20:30:56 -07:00
Hall Liu
0b9ebf1d44
Merge "Add test API to override carrier config" am: a82f952fe7 am: 657e2a925d
...
am: 19c6fd5ab1
2018-10-25 19:39:19 -07:00
Nathan Harold
1be1fa0be0
Merge "Add getMobileNetworkOperator to CellIdentityTdscdma" am: ac87c0a884 am: 8dc36336d5
...
am: 7695b94e10
2018-10-25 19:32:53 -07:00
Nathan Harold
6bdfcd4462
Merge "Remove Hidden TimestampType From CellInfo" am: c65e610c06 am: 0cce6d2bf4
...
am: fce9aea69a
2018-10-25 19:18:41 -07:00
Tyler Gunn
1af91e3de8
Merge "Re-add removed APIs per API council feedback." am: a94a71af13 am: 7085118cfc
...
am: db0e0f8c57
2018-10-25 18:55:47 -07:00
sqian
36d6e75155
Merge "Add @Nullable for getSubscriptionIds" am: ceceb459e0 am: 6d46d98598
...
am: 1b023cfa7c
2018-10-25 18:04:39 -07:00
Chen Xu
e4e589163b
Merge "NWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType" am: 6730f34590 am: 23e8eadca9
...
am: 8da63cc369
2018-10-25 17:39:14 -07:00
Chen Xu
1dd69f1924
Merge "Need to check empty not null for String" am: e09f7b5ebb am: 99053e471d
...
am: 97ddb61829
2018-10-25 17:32:51 -07:00
Amit Mahajan
1e774558c5
Merge "Adding new intent ACTION_SMS_MMS_DB_CREATED."
2018-10-25 23:44:50 +00:00
Amit Mahajan
8c1c45a710
Adding new intent ACTION_SMS_MMS_DB_CREATED.
...
Test: manual (verified from logcat that intent is broadcast)
Bug: 115990430
Change-Id: I660cf2d04a1b57a58c8cefd212e5f8d73b329890
2018-10-25 13:00:36 -07:00
Brad Ebinger
eeb74b5312
Merge "Remove obsolete @VisibleForTesting Annotation" am: 1e8249a1d6
...
am: 2c8ace0794
2018-10-24 19:25:55 -07:00
Brad Ebinger
ee7267f8dd
Merge "ImsSsData needs a public constructor for vendors to use" am: a1474266bf
...
am: 207b9dcfbf
2018-10-24 17:59:39 -07:00
Youming Ye
e937fd1ad3
Merge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting"" am: 94fe6430ea
...
am: 555090d597
2018-10-24 17:41:46 -07:00
Tony Zhu
3403275a85
Merge "[Call Screening]Support for carrier call screening app" am: ee31b2214d
...
am: 3cde670dd3
2018-10-24 17:25:19 -07:00
Hall Liu
19c6fd5ab1
Merge "Add test API to override carrier config" am: a82f952fe7
...
am: 657e2a925d
2018-10-24 16:33:18 -07:00
Nathan Harold
7695b94e10
Merge "Add getMobileNetworkOperator to CellIdentityTdscdma" am: ac87c0a884
...
am: 8dc36336d5
2018-10-24 16:28:49 -07:00
Nathan Harold
fce9aea69a
Merge "Remove Hidden TimestampType From CellInfo" am: c65e610c06
...
am: 0cce6d2bf4
2018-10-24 16:18:38 -07:00
Nathan Harold
41e2d7494f
Merge "Move some members to the "Q blacklist"." am: f5cf9f24ed
...
am: 13c9e7e2f3
2018-10-24 16:14:06 -07:00
Tyler Gunn
db0e0f8c57
Merge "Re-add removed APIs per API council feedback." am: a94a71af13
...
am: 7085118cfc
2018-10-24 16:09:16 -07:00
Xiangyu/Malcolm Chen
ecc6407263
Merge "Add PhoneStateListener#onPreferredDataSubIdChanged" am: 0875fbab4b
...
am: 4190b87df6
2018-10-24 15:53:27 -07:00
sqian
1b023cfa7c
Merge "Add @Nullable for getSubscriptionIds" am: ceceb459e0
...
am: 6d46d98598
2018-10-24 15:28:44 -07:00
Chen Xu
8da63cc369
Merge "NWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType" am: 6730f34590
...
am: 23e8eadca9
2018-10-24 15:11:14 -07:00
Chen Xu
97ddb61829
Merge "Need to check empty not null for String" am: e09f7b5ebb
...
am: 99053e471d
2018-10-24 15:05:23 -07:00
Chen Xu
db45db791a
Merge changes from topic "carrier_id_aosp_cp" am: fccdf46adf
...
am: 8463ad7760
2018-10-24 14:58:06 -07:00
Brad Ebinger
1e8249a1d6
Merge "Remove obsolete @VisibleForTesting Annotation"
2018-10-24 20:15:35 +00:00
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
Malcolm Chen
05a9565074
Changing setPreferredData so that it takes subId.
...
Bug: 92796390
Test: build
Change-Id: I189fbe3c47f51f361838a6737fb5bef3aa1f0ee9
2018-10-23 16:56:48 -07:00
Nathan Harold
ac87c0a884
Merge "Add getMobileNetworkOperator to CellIdentityTdscdma"
2018-10-23 23:34:26 +00:00
Brad Ebinger
8853179fa7
Remove obsolete @VisibleForTesting Annotation
...
Bug: 118296374
Test: atest FrameworksTelephonyTests
Change-Id: I5156db7d199f89307ca7c602bfc855dbc6ae236e
2018-10-23 15:46:59 -07: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
Brad Ebinger
35cfa4fea5
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 10:44:48 -07:00
Chen Xu
6730f34590
Merge "NWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType"
2018-10-22 17:30:16 +00:00
