Commit Graph

5297 Commits

Author SHA1 Message Date
Hall Liu
0afd2d0288 Merge "Add CarrierConfig key for RTT support" am: e5a913661d am: 79dc6fb815
am: 6365fde4c0

Change-Id: I652fb64918aaf7dbd87910d35329b2752914e937
2017-12-12 02:46:53 +00:00
Amit Mahajan
036ffe55d5 Merge "Revert "Add support for send Message with messaging options"" am: 563d93c107 am: b1ba135258
am: 339c512db0

Change-Id: I0539d1f7db3a307f7fb0b27e0b2a3a3e13a71538
2017-12-12 02:32:54 +00:00
Hall Liu
e5a913661d Merge "Add CarrierConfig key for RTT support" 2017-12-12 01:44:08 +00:00
Tyler Gunn
70ac1bd125 Merge "Add carrier config to always play hold tone when remotely held." am: c352f5f861 am: c9187f9199
am: e31e0d5a7a

Change-Id: Ic14315ea8a85fe9108e765fb32ce23b68ff31756
2017-12-12 01:40:08 +00:00
TreeHugger Robot
4c2009c236 Merge "Make TelephonyManager#getEmergencyCallbackMode SystemApi" 2017-12-12 01:30:03 +00:00
Amit Mahajan
563d93c107 Merge "Revert "Add support for send Message with messaging options"" 2017-12-12 01:04:54 +00:00
Treehugger Robot
c352f5f861 Merge "Add carrier config to always play hold tone when remotely held." 2017-12-12 00:56:37 +00:00
Amit Mahajan
b348a347df Revert "Add support for send Message with messaging options"
This reverts commit bbef627077.

Reason for revert: Causing long sms failure

Bug: 68762942
Change-Id: I43c36e3286105459c7e08d1a0b2d89b4c42140b2
2017-12-11 23:30:35 +00:00
Holly Jiuyu Sun
6627d2c4df Merge "Carrier confirmation code." 2017-12-11 23:29:34 +00:00
Hall Liu
47ed62080f Add CarrierConfig key for RTT support
Add the carrier config key.

Test: add fake support for some random carrier, look for the capability
Bug: 63934808
Change-Id: I8a0e33a7ac10fbdcad356059913e7ddcba26bb6c
2017-12-11 14:41:31 -08:00
Shuo Qian
f413d90f0d Merge "Add ICCID_PREFIX column in CarridId DB" 2017-12-11 22:19:52 +00:00
Jeff Sharkey
27674aedc0 Merge "Add auto-doc support for @StringDef." 2017-12-11 16:47:13 +00:00
sqian
4fe8280dc6 Add ICCID_PREFIX column in CarridId DB
Bug: 64131637
Test: Treehugger runs providers/telephony/CarrierIdProviderTest.java

Change-Id: I0d118ab181dfe17a7976a0b654989a3662594d4a
2017-12-11 05:42:41 +00:00
Holly Jiuyu Sun
d5e7ca924d Carrier confirmation code.
If confirmation code is null and required during downloading a profile,
returns a resovable error, and show ConfirmationCodeActivity. After we
get the confirmation code from the user, continue the operation.

Add the confirmationCode as a member in DownloadableSubscription.

Merged-In: Ibe1e0fc5ddb736b411faf48ec9bea3c68972bb99
Test: unit test, e2e on phone
Bug: 36730837
Change-Id: Ibe1e0fc5ddb736b411faf48ec9bea3c68972bb99
2017-12-08 17:08:27 -08:00
Jeff Sharkey
5db9a91135 Add auto-doc support for @StringDef.
Behaves pretty much the same as @IntDef, but now supports "suffix"
in addition to "prefix" when matching constants.

Test: manual docs output looks sane
Bug: 70406696
Change-Id: I35064b0f9f36f1f13ccdb40302d818a004014f15
2017-12-08 17:33:40 -07:00
Xiangyu/Malcolm Chen
95b897aadb Merge "Adding cache of IMS provisioned values." 2017-12-09 00:24:40 +00:00
Jack Yu
6f0b7bb165 Merge "Added test cases for DataCallResponse parcel read/write" 2017-12-08 21:24:25 +00:00
Jordan Liu
cff2b8682a Merge "IMS: Add support for STK CC feature" am: bc813005b8 am: 9c9e54b066
am: e5146444a4

Change-Id: Iab760a8db125f30bce6dbda2b3d784fb135995da
2017-12-08 03:54:43 +00:00
Malcolm Chen
2b460020c3 Adding cache of IMS provisioned values.
Adding cache of IMS provisioned values in ImsConfigImplBase.

Bug: 66701374
Test: unitest

Change-Id: I98f8fc12fe44a668d43464cd5f4d2abc03f29764
2017-12-07 17:42:54 -08:00
Jordan Liu
bc813005b8 Merge "IMS: Add support for STK CC feature" 2017-12-08 00:14:57 +00:00
Jack Yu
14c2aaa0a2 Added test cases for DataCallResponse parcel read/write
bug: 64132030
Test: Unit tests
Change-Id: I87a9af987dd7366bfe6b22252e2c4bdc0fbdd727
2017-12-07 15:49:09 -08:00
Jack Yu
c7efe16191 Merge "Moved data connection response into system api." 2017-12-07 19:01:29 +00:00
Jack Yu
e44609b158 Moved data connection response into system api.
This is a preliminary step for IWLAN refactoring, where data response
will be one of the parameter in data service callback.

Test: Telephony sanity tests
bug: 64132030
Change-Id: I7eb5318cd75ca3b7a29d5bf0da18d6b29a228ee1
2017-12-07 00:27:17 -08:00
Suresh Koleti
0c22feffaa IMS: Add support for STK CC feature
-- Add interface in IImsUtListener to get data for
   UNSOL_ON_SS.
-- Add new file ImsSsData to store the data received
   as part of UNSOL_ON_SS.
-- Add approprate error codes and strings to support
   to show error dialogs to user.
-- Add ImsUtInterface API's to indicate UNSOL_ON_SS
   to ImsPhoneCallTracker.

Test: Manual
Bug: 64685331
Change-Id: I023c1af0d521e5b19ecce1576c4caa299ae468e3
2017-12-06 21:00:24 +05:30
Jeff Davidson
3a52e7e7bb Merge "Update PhoneStateListener#onCallStateChanged Javadoc." 2017-12-06 00:39:36 +00:00
Jeff Davidson
e8cd59195c Update PhoneStateListener#onCallStateChanged Javadoc.
While the doc suggested that the phone number was "incoming" (e.g.
only populated for incoming calls), it should also be populated for
outgoing calls.

Bug: 67748129
Test: Verified expected behavior on Taimen running OC-MR1, added CTS
test (see other CL in this topic)
Change-Id: I1ddd9c042f287953358a794b91b2af5ed6f5b597
2017-12-05 11:43:08 -08:00
TreeHugger Robot
df12954187 Merge "Change TelephonyManager#getCdmaPrlVersion() from hidden to @SystemApi" 2017-12-05 19:00:12 +00:00
Colin Cross
6584e5e650 Merge "Remove unused AIDL files" am: d0abc863f4 am: 43f665c95e
am: 3dbbd3d3a9

Change-Id: Ida23b5013fa6a3e1fd6ba3e5a699f798f29b4b84
2017-12-05 01:10:14 +00:00
Jordan Liu
d2d35453a4 Merge "Make it possible to hide signal strength via Carrier Config" am: febd180254 am: 516b41e5a5
am: 1470313b97

Change-Id: Ice7debdbe8caabb0fa1b530a9318f92c25b483af
2017-12-05 00:55:51 +00:00
Colin Cross
43f665c95e Merge "Remove unused AIDL files"
am: d0abc863f4

Change-Id: Ia6d798f6acf3930945cac488db81ccec3792648d
2017-12-05 00:06:29 +00:00
goneil
8f5733897a Make TelephonyManager#getEmergencyCallbackMode SystemApi
BUG: 67750821
Test: android.telephony.cts.TelephonyManagerTest#testTelephonyManager().
Basic test to ensure that the method does not throw any exception.

Change-Id: I00f0e62803810b2650eba7562a84774369e917c6
2017-12-04 15:50:11 -08:00
Jordan Liu
516b41e5a5 Merge "Make it possible to hide signal strength via Carrier Config"
am: febd180254

Change-Id: Iff2bf2fa0132692b3164d5543cfd20cd1d153ede
2017-12-04 23:44:36 +00:00
Treehugger Robot
d0abc863f4 Merge "Remove unused AIDL files" 2017-12-04 23:35:35 +00:00
Jordan Liu
febd180254 Merge "Make it possible to hide signal strength via Carrier Config" 2017-12-04 23:20:31 +00:00
goneil
60674755f6 Change TelephonyManager#getCdmaPrlVersion() from hidden to @SystemApi
Bug: 67751148
Change-Id: I747e683279c2b684c3c255ddfcd33f74f52b587e
Test: com.google.android.gts.telephony.TelephonyManager#testGetCdmaPrlVersion()
2017-12-04 15:15:43 -08:00
Colin Cross
4e1b9c199d Remove unused AIDL files
These files show up in a glob for all AIDL files, but are not listed
in AIDL files to be built, and have no references in codesearch
except for one unused import.

Bug: 70046217
Test: m checkbuild
Change-Id: I7d6a3bb19d2e16b5f09473f3058afcf5b4edd9b6
2017-12-04 11:14:25 -08:00
Evan Laird
c52f0b61b4 Resolve merge conflicts of 710b3946e5 to master
Test: runtest -x
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java

Change-Id: I95ed65102c3d61a0afa0744663d6966c10f876e5
2017-12-04 11:24:42 -05:00
Evan Laird
1fed537674 Merge "SystemUI: Display RAT icon when data is off"
am: e441298a11

Change-Id: I483d17ac1ef79b9b6f31bbefaf03f7833e13020b
2017-12-04 14:50:15 +00:00
Evan Laird
e441298a11 Merge "SystemUI: Display RAT icon when data is off" 2017-12-04 14:37:16 +00:00
Android Build Merger (Role)
da694a5009 Merge "Merge "Set sIsInitialized to false and add logging" am: a0a70be251 am: cfa4bb4bf3 am: a7d195905d" 2017-12-02 02:54:54 +00:00
Hall Liu
9c649e6fe7 Merge "Set sIsInitialized to false and add logging" am: a0a70be251 am: cfa4bb4bf3
am: a7d195905d

Change-Id: I26f9b4dfbfd57e6b17dd6bf1b4a8759af8d54483
2017-12-02 02:51:43 +00:00
TreeHugger Robot
ebc8175fe3 Merge "Update description of ACTION_PROVISION_EMBEDDED_SUBSCRIPTION" 2017-12-02 02:50:13 +00:00
Hall Liu
cfa4bb4bf3 Merge "Set sIsInitialized to false and add logging"
am: a0a70be251

Change-Id: I578a9f5690d2320116427025f831e11c9ffcdd7d
2017-12-02 02:09:03 +00:00
Hall Liu
a0a70be251 Merge "Set sIsInitialized to false and add logging" 2017-12-02 01:35:15 +00:00
Hall Liu
5e9727f5df Set sIsInitialized to false and add logging
When the service goes away due to a remote exception, set sIsInitialized
to false as well as setting the service to null.
Also log the serviceconnection disconnect.

Bug: 70032958
Test: cts
Change-Id: I34c1ea804537c62bd4348ba3aeeca7ba2c0becb6
2017-12-01 14:01:15 -08:00
Tyler Gunn
3088942b9e Add carrier config to always play hold tone when remotely held.
By default, a remote hold tone is played when a call is remotely held.
In other words if the callee puts the caller on hold, they will hear a
tone indicating they're on hold.  Current behavior is to only do this
when the audio direction for the call is inactive. Some carriers wish to
have this behavior when the audio direction is active.
This new carrier config option is OFF by default and will be selectively
enabled for carriers which wish to play a hold tone when the audio is
active.

Test: Manual
Bug: 64099717
Change-Id: I747a5fb650c8e83a61b6512375e43e45a5ea0362
2017-12-01 08:14:52 -08:00
Cassie
8b324799ad Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46dc am: 3ba72e7130
am: 9afe3b1252

Change-Id: Ib1db63334919e6d8f605fb2b342265cd71348982
2017-12-01 05:51:17 +00:00
Cassie
3ba72e7130 Merge "Quick fix the getMobileNetworkOperator() in CellIdentity."
am: 298d2a46dc

Change-Id: I53f8165577dc7cdd98301b5752a32cc19d0dc8b3
2017-12-01 05:30:06 +00:00
Treehugger Robot
298d2a46dc Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." 2017-12-01 05:19:29 +00:00
Qingxi Li
2d7f90c452 Update description of ACTION_PROVISION_EMBEDDED_SUBSCRIPTION
Bug: 62420605
Test: NA
Change-Id: Ia4a72738cc1834d3d2ad4c5b4a68977b8e943872
2017-11-30 18:49:00 -08:00