Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
385,532 Commits 3 Branches 0 Tags
7fde1c770be252ec6fd5ae48872a4dbb258ac661
Commit Graph

4089 Commits

Author SHA1 Message Date
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
Cassie Han
2f99ddf39b Merge "Move SECRET_CODE_ACTION from Telephony.Sms.Intents to TelephonyManager." am: 47c7675ae4 am: f803b12008 
am: 4a278cde8c

Change-Id: Iab1ad2b03adcd7d8ce56811a7356120c069c44e6
 2018-08-30 09:13:36 -07:00
Cassie Han
f803b12008 Merge "Move SECRET_CODE_ACTION from Telephony.Sms.Intents to TelephonyManager." 
am: 47c7675ae4

Change-Id: I4e34682fddc43001455523b2b1b3dba5716dbdba
 2018-08-30 08:47:35 -07:00
Cassie Han
47c7675ae4 Merge "Move SECRET_CODE_ACTION from Telephony.Sms.Intents to TelephonyManager." 2018-08-30 15:15:27 +00:00
Ian Zerny
4894817d0d Merge "Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT"" am: b0896e61f8 am: ba11aeee6e 
am: 8396f846fe

Change-Id: I4f8232db1b11be07363cda7ddf954dd4a51e0629
 2018-08-30 05:10:26 -07:00
Ian Zerny
ba11aeee6e Merge "Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT"" 
am: b0896e61f8

Change-Id: I356bd75a0d1b0a0334cde5703a9ce7a24874bed4
 2018-08-30 02:51:21 -07:00
Ian Zerny
b0896e61f8 Merge "Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT"" 2018-08-30 08:29:58 +00:00
Ian Zerny
e72a524590 Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT" 
This reverts commit 3284e35061.

Reason for revert: breaks most branches

Bug: 112867975
Change-Id: Icb27e193529f523f4cf07ef55e19625c402a2d3b
 2018-08-30 08:29:25 +00:00
Meng Wang
d7f361e924 Merge "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT" am: d8523f3c01 am: 62ced9c2d8 
am: 76dcc6b470

Change-Id: I6a3699d7d6019d35ef85d536c43ecb94e6747ed0
 2018-08-29 20:11:06 -07:00
Meng Wang
62ced9c2d8 Merge "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT" 
am: d8523f3c01

Change-Id: I74bbd4bf00140e06a3a20d9f41f7078d8ac6ba50
 2018-08-29 19:38:06 -07:00
Treehugger Robot
d8523f3c01 Merge "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT" 2018-08-30 02:16:38 +00:00
Pengquan Meng
93518497b1 Merge "Add new Telephony API for settings migration" 
am: adbe45e0ca

Change-Id: Ie3b4c9529cc4279f0caf462efaca18d06689f629
 2018-08-29 18:03:16 -07:00
Mengjun Leng
3918f4fc14 Add carrier config of showing original dial string for CDMA MO call 
Support to configure showing original dial string for CDMA MO call.

Bug: 62074217
Change-Id: Icfd542107e36641823d2fdcb815b9456a8d61f36
Merged-In: Icfd542107e36641823d2fdcb815b9456a8d61f36
 2018-08-30 00:27:13 +00:00
Mengjun Leng
c9356228da Add carrier config of showing original dial string for CDMA MO call 
Support to configure showing original dial string for CDMA MO call.

Bug: 62074217
Change-Id: Icfd542107e36641823d2fdcb815b9456a8d61f36
 2018-08-29 17:24:21 -07:00
Pengquan Meng
ad224b637e Add new Telephony API for settings migration 
Bug:111453847
Test: build test
Change-Id: Ia4468664453e532e80b8834e53d386fabeb11c41
Merged-In: Ia4468664453e532e80b8834e53d386fabeb11c41
 2018-08-29 22:19:15 +00:00
sqian
cd4dafb77e Make SubscriptionManager.getSubId public 
Test: Treehugger
Bug: 113072551
Change-Id: I4f5684fed53486c185cc9867882b7ee98cd02a5d
 2018-08-29 14:13:21 -07:00
Brad Ebinger
2943823a8f Merge "IMS: Support Robocall Feature For MT VOLTE Calls" 2018-08-29 20:03:13 +00:00
Pengquan Meng
db1cc81a90 Merge "Update TelephonyManager document" 2018-08-29 00:24:09 +00:00
Jack Yu
ce53935aef Merge "Added access networks manager" am: c5a00e0957 am: 1804391a45 
am: e78450033f

Change-Id: Ida5dfb3c9471cf1a7340bfbb22ee336c64c19b69
 2018-08-28 15:55:51 -07:00
Jack Yu
1804391a45 Merge "Added access networks manager" 
am: c5a00e0957

Change-Id: I0524b4e3ee57026e613b0d6de7c21f60204ba3bf
 2018-08-28 15:25:04 -07:00