Commit Graph

4108 Commits

Author SHA1 Message Date
Nathan Harold
916f8c3618 Merge "Don't Use NPE for Flow Control in getCellLocation" am: 86f991a7bd am: 65e63ce0de
am: dfca0da00e

Change-Id: I1a0c3f4f0b8936dc019f7faef3d69df6d5e86afb
2018-09-14 19:34:59 -07:00
Nathan Harold
65e63ce0de Merge "Don't Use NPE for Flow Control in getCellLocation"
am: 86f991a7bd

Change-Id: I3440e965f8f7edfa86359677e704140f39deb320
2018-09-14 19:15:54 -07:00
Treehugger Robot
86f991a7bd Merge "Don't Use NPE for Flow Control in getCellLocation" 2018-09-15 00:23:28 +00:00
Mathew Inwood
8c854f86a4 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
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
2018-09-14 13:18:34 +01:00
Pengquan Meng
624ccc3331 Merge "Add New TelephonyManager APIs"
am: b65aca27af

Change-Id: I18c7c905f742e40331dca61efc9c314e6b08ad32
2018-09-12 19:32:41 -07:00
Pengquan Meng
b65aca27af Merge "Add New TelephonyManager APIs" 2018-09-13 01:09:47 +00:00
Pengquan Meng
eda353bc52 Merge "Update TelephonyManager document"
am: 14faaf660d

Change-Id: Ib155f7cde84ea033164c99f8e09d9fe797badae8
2018-09-12 16:53:13 -07:00
Pengquan Meng
efe8adff87 Update TelephonyManager document
Bug: 111453847
Test: build
Merged-In: Ief746e771dc9435782dec75cf2259d5b9f040c27
Change-Id: Ief746e771dc9435782dec75cf2259d5b9f040c27
2018-09-12 10:23:56 -07:00
sqian
62283fddfb Merge "Make SubscriptionManager.isValidSubscriptionId public" am: 241aa86ed6 am: 7dc073995b
am: bd4b87961f

Change-Id: I28d119d30bc48347715f6c0fe3efdb121a3e2340
2018-09-12 09:24:37 -07:00
sqian
7dc073995b Merge "Make SubscriptionManager.isValidSubscriptionId public"
am: 241aa86ed6

Change-Id: Ibbb69ba6e01d21bdd414afc73a90a965244eeae6
2018-09-11 18:31:32 -07:00
Pengquan Meng
97c29e04fa Add New TelephonyManager APIs
Bug:111453847
Test: build test
Merged-In: I83a5f4149f92ce495cd066f7158e7ff37a66894f
Change-Id: I83a5f4149f92ce495cd066f7158e7ff37a66894f
2018-09-11 15:07:56 -07:00
Xiangyu/Malcolm Chen
e3d93a25d6 Merge "Add API to listen to opportunistic subscriptions change."
am: 26e686a973

Change-Id: I20ba8865169a857e73b4094ac170f63bf41a66a3
2018-09-11 13:11:24 -07:00
sqian
00dae7e097 Make SubscriptionManager.isValidSubscriptionId public
And rename subId to subscriptionId.

Test: Treehugger
Bug: 113072551
Change-Id: I4bdf705d7f81bad423ed867972fd1ed7fe5717d0
2018-09-11 11:52:52 -07:00
Malcolm Chen
27829e2d17 Add API to listen to opportunistic subscriptions change.
Add a new set of APIs so that caller can listen to
opportunistic subscriptions changes.

Bug: 92796390
Test: build
Change-Id: Iaa741141bf1bd04c4b1618d5bfeac733a0690ed8
Merged-In: Iaa741141bf1bd04c4b1618d5bfeac733a0690ed8
2018-09-10 15:36:08 -07:00
Pengquan Meng
1e1f0b3e10 Merge "Add New TelephonyManager APIs" 2018-09-08 06:23:16 +00:00
Xiangyu/Malcolm Chen
a1a74cb44d Merge "Add API to listen to opportunistic subscriptions change." 2018-09-07 20:17:17 +00:00
Pengquan Meng
2a949cdd1e Add New TelephonyManager APIs
Bug:111453847
Test: build test
Change-Id: I83a5f4149f92ce495cd066f7158e7ff37a66894f
2018-09-07 11:56:30 -07:00
Nathan Harold
edf6ccaeb3 Don't Use NPE for Flow Control in getCellLocation
Remove catch of NPE from getCellLocation and do explicit
null checks. This will make it easier to differentiate
between actual problems and local NPEs. In pre-P, there
were multiple conditions that would intentionally return
null over the binder interface. In Post-P null is returned
when location is disabled, which means that null is a very
common return value. We shouldn't use NPE to handle the
case where location is disabled.

Bug: 114294321
Test: manual w/ SL4A (no automated tests for TM)
Change-Id: Ie5b3afa56f280ff901ff9fa7c93f958d754f109b
2018-09-07 11:56:08 -07:00
Malcolm Chen
13f31af137 Add API to listen to opportunistic subscriptions change.
Add a new set of APIs so that caller can listen to
opportunistic subscriptions changes.

Bug: 92796390
Test: build
Change-Id: Iaa741141bf1bd04c4b1618d5bfeac733a0690ed8
2018-09-06 19:00:06 -07:00
sqian
7fde1c770b resolve merge conflicts of b96891b805 to master
Test: I solemnly swear I tested this conflict resolution.
Bug: 113072551
Change-Id: I0077bfea84e5ff9a37bfc8c84c7d1d38872f3561
2018-09-06 23:05:46 +00:00
Sooraj Sasindran
d71ccc543e Merge "Introduce AlternativeNetworkAccess APIs" 2018-09-06 20:32:01 +00:00
sqian
d88648a475 Merge "Make SubscriptionManager.getSubId public"
am: f9fa9a63bb

Change-Id: I1dbc088c8668df43a18741a58b9c32ef5eae1fc9
2018-09-06 13:26:59 -07:00
Treehugger Robot
f9fa9a63bb Merge "Make SubscriptionManager.getSubId public" 2018-09-06 20:06:02 +00:00
Sooraj Sasindran
165c9e90fb Introduce AlternativeNetworkAccess APIs
Introduce AlternativeNetworkAccess APIs

Bug: 113106744
Test: Verified using test app to make api calls
Change-Id: I7f470cd6028a12cc66a660d58720f803271d38eb
2018-09-06 10:32:56 -07:00
Xiangyu/Malcolm Chen
29f9a240c0 Merge "Add VisibleForTesting to create TelephonyRegistryTest." 2018-09-04 20:26:30 +00:00
Brad Ebinger
77893e4032 Merge "Only make a subset of Call Barring options visible per carrier" am: e310df92db am: 7361cbf56f
am: 6bf2079272

Change-Id: I924bb2732750a7c80e5b44c2ef6fe04cab717ab9
2018-09-04 10:34:46 -07:00
Brad Ebinger
7361cbf56f Merge "Only make a subset of Call Barring options visible per carrier"
am: e310df92db

Change-Id: I10ee07ac395ee39151c81f438528099f1f4f1032
2018-09-04 10:13:43 -07:00
Brad Ebinger
e310df92db Merge "Only make a subset of Call Barring options visible per carrier" 2018-09-04 16:46:34 +00:00
yifan.bai
009bbbf62d Merge "Fix oldMergedSS is altered to OUT_OF_SERVICE." am: 29664b8206 am: a9598c6f6c
am: 92cfc4a192

Change-Id: I154fccf2ee1046de3b4ec2c0e628114371d7fb45
2018-08-31 19:41:49 -07:00
yifan.bai
a9598c6f6c Merge "Fix oldMergedSS is altered to OUT_OF_SERVICE."
am: 29664b8206

Change-Id: I4bd5c07860640a2bc5eabd8a582a13669b3f022f
2018-08-31 19:20:33 -07:00
Treehugger Robot
29664b8206 Merge "Fix oldMergedSS is altered to OUT_OF_SERVICE." 2018-09-01 02:02:24 +00:00
Shuo Qian
701d213e0a Merge "Deprecate some system apis in TelephonyManager"
am: cec2e41d43

Change-Id: Icce3d305bf6a92660eac785f0088788fea1ddb77
2018-08-31 17:40:07 -07:00
sqian
54016bdbca Merge "Call Redirection Surface in Telecom out going call flow"
am: 11486bfab2

Change-Id: Id5426d4695a8b9caceb2a429f1201f78e5f5c9cb
2018-08-31 17:36:01 -07:00
Shuo Qian
cec2e41d43 Merge "Deprecate some system apis in TelephonyManager" 2018-08-31 23:43:58 +00:00
sqian
cae1f264b9 Call Redirection Surface in Telecom out going call flow
- Provide a Call Redirection API Surface
- Provide a key "KEY_CALL_REDIRECTION_SERVICE_COMPONENT_NAME_STRING"
  in the CarrierConfigManager
- Create .aidl interfaces for Call Redirection
(CallRedirectionService.aidl, CallRedirectionAdapter.aidl)

Bug: 64959558
Test: Compile
Change-Id: Ic119fa445e66f1275eabf944c77fdc981bc9a2a7
Merged-In: Ic119fa445e66f1275eabf944c77fdc981bc9a2a7
(cherry picked from commit ea8970cd55)
2018-08-31 12:59:40 -07:00
Brad Ebinger
ee570a61de Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." 2018-08-31 19:54:30 +00:00
Brad Ebinger
0819bac270 Only make a subset of Call Barring options visible per carrier
Some carriers do not support changing the password and
deactivating all call barring options using the "Call Barring" UI.
These options aren't available over the UT interface, so
the options are always grayed out.

Adds KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL and
KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL keys to the
CarrierConfigManager to handle these two cases.

Test: disable carrier configs manually and check UI
Bug: 80510612
Change-Id: I0190f15107ae1828ba98902ca10ed4128fb71dbf
2018-08-31 10:45:56 -07:00
SongFerngWang
908020e9f1 add three new carrier configs for call forwarding, Caller ID and Call Waiting.
The carrier configs control the call forwarding and additional
settings button in the Call Settings menu and caller ID and
call waiting in additional settings menu.

Bug: 110121209
Test: manual - test case as below :
1.flag clir on and flag cw on ,do CLIR show/hide,
    and make call to other device.(PASS)
2.flag clir on and flag cw on ,do CW on/off,and CW function work.(PASS)
3.flag clir off and flag cw on ,no CLIR in additional settings page(PASS)
4.flag clir off and flag cw on ,do CW on/off,and CW function work.(PASS)
5.flag clir on and flag cw off ,do CLIR show/hide ,
    and make call to other device.(PASS)
6.flag clir on and flag cw off ,no CW in additional settings page(PASS)
7.flag clir off and flag cw off,
    no Additional Settings in call feature settings(PASS)
8.flag cf off,no cf in call settings page (PASS)
Merged-In: I7f11346be248bd325f14d7039f5a5d5b2f45617a
Change-Id: I29d7a71ad57b3b05ccc6025154f63119b35dab71
2018-08-31 10:24:49 -07:00
yifan.bai
257be4778a Fix oldMergedSS is altered to OUT_OF_SERVICE.
ServiceState.copyFrom would throw NPE if s.mCellBandwidths is null.
To fix, if s.mCellBandwidths is null, init mCellBandwidths to be null.

Test: Build pass;
Test: atest FrameworksTelephonyTests:ServiceStateTrackerTest

Bug: 112714563
2018-08-31 05:38:42 +00:00
Hall Liu
415fe82dd6 Merge "Add carrier config of showing original dial string for CDMA MO call"
am: 9b2f244bda

Change-Id: I6631e0019cbf79cabca6ef7f5eb51007cb007749
2018-08-30 17:43:27 -07:00
Hall Liu
9b2f244bda Merge "Add carrier config of showing original dial string for CDMA MO call" 2018-08-31 00:27:11 +00:00
Meng Wang
6243c05ba2 Merge "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT" am: 3d48b0e1cd am: b27a5ec815
am: f1b7ad744e

Change-Id: I5c129711fde7901de057c37ed081d66920913c26
2018-08-30 17:19:27 -07:00
Meng Wang
b27a5ec815 Merge "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT"
am: 3d48b0e1cd

Change-Id: I2f9f58ada65300be311cbca4ae338c847f4ff6f3
2018-08-30 16:49:12 -07:00
Meng Wang
3d48b0e1cd Merge "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT" 2018-08-30 23:06:24 +00:00
Brad Ebinger
cca7d943cf Merge "Fix docs comment for ACTION_SECRET_CODE" am: 608fa51d55 am: cd8462408a
am: 5e2bcb2cdd

Change-Id: I3accd507a8ea66a9868931a09b068628942183c6
2018-08-30 15:39:54 -07:00
Hall Liu
b44179338e Merge "Add carrier config of showing original dial string for CDMA MO call" 2018-08-30 22:06:04 +00:00
Brad Ebinger
cd8462408a Merge "Fix docs comment for ACTION_SECRET_CODE"
am: 608fa51d55

Change-Id: I6e9fb024feab2e028452e1b2924897091971f328
2018-08-30 14:53:24 -07:00
Brad Ebinger
8b05d8b40d Fix docs comment for ACTION_SECRET_CODE
Test: makeg doc-comment-check-docs
Bug: 112440728
Change-Id: I0c953ce2112e30534847fafc8ab9d286e82a102f
2018-08-30 21:10:02 +00:00
Meng Wang
71b6039bff Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT
Bug: 112867975
Test: make docs
Change-Id: I281d30f874136c77ad1d0e66747694bb1b79e67c
2018-08-30 12:11:27 -07:00
Malcolm Chen
3ceeeddfea Add VisibleForTesting to create TelephonyRegistryTest.
Bug: 113305153
Test: unittest
Change-Id: Ie59b2da76fbc813ce011d4d0ab3ff533a6006e14
2018-08-30 11:34:28 -07:00