Commit Graph

4564 Commits

Author SHA1 Message Date
Hall Liu
e3f689d924 Merge "Add TestApi to get RTT support status" am: f583bb525a am: c02e86d0bf
am: 80dc0e2676

Change-Id: I9a9c30bac258ae38c44b2d82fca1572e96eb1cf7
2018-11-01 18:49:41 -07:00
Hall Liu
80dc0e2676 Merge "Add TestApi to get RTT support status" am: f583bb525a
am: c02e86d0bf

Change-Id: I2dae10205691bc6e32be24f70bc786a1ec6f1a96
2018-11-01 18:24:42 -07:00
Hall Liu
f583bb525a Merge "Add TestApi to get RTT support status" 2018-11-02 00:43:27 +00:00
Chen Xu
252040f54f Merge "hidden API getCertsFromCarrierPrivilegeAccessRules" 2018-11-02 00:20:33 +00:00
Chen Xu
35d377e27d Merge "refactor resetNv API to resetRadioConfig and rebootRadio" am: e459133141
am: d565e3168e

Change-Id: I8e41afef66a16cc89a7f306711343f56a8995c19
2018-11-01 15:03:51 -07:00
Hall Liu
f4f09a4945 Merge "Change default of hide LTE+ config to true" am: 3e478bf55e am: 1e35170bfc
am: 94af334c99

Change-Id: Ieb94bafc3e3890e5e3a9bc683098f867918c3de3
2018-11-01 14:56:30 -07:00
Chen Xu
e459133141 Merge "refactor resetNv API to resetRadioConfig and rebootRadio" 2018-11-01 21:29:39 +00:00
Hall Liu
94af334c99 Merge "Change default of hide LTE+ config to true" am: 3e478bf55e
am: 1e35170bfc

Change-Id: I3d30f7903a20e94bd4f6aa959091a76323d99831
2018-11-01 14:13:48 -07:00
Chen Xu
2e96a44f27 Merge "Revert "Need to check empty not null for String"" am: 8c64274ee6 am: 622d3051b3
am: 01dba7052f

Change-Id: Id435dde94aaaa12f3fbcba0c3159788ecce372c3
2018-11-01 13:46:37 -07:00
Chen Xu
01dba7052f Merge "Revert "Need to check empty not null for String"" am: 8c64274ee6
am: 622d3051b3

Change-Id: Ie9e2e50dfbe50044b3b8ba9248fd52db2797443b
2018-11-01 13:28:05 -07:00
Jack Yu
1526091844 Merge "Deprecated the resource config_tether_apndata" 2018-11-01 20:25:43 +00:00
Hall Liu
3e478bf55e Merge "Change default of hide LTE+ config to true" 2018-11-01 20:10:59 +00:00
chen xu
c9b22f31a1 hidden API getCertsFromCarrierPrivilegeAccessRules
Bug: 110559381
Test: unit test & manual test
Change-Id: I7b2c946f1f4db08e1c071fe6eb9f3771a592fd47
2018-11-01 13:02:15 -07:00
Chen Xu
8c64274ee6 Merge "Revert "Need to check empty not null for String"" 2018-11-01 20:00:36 +00:00
Shuo Qian
474bfa9ce0 Merge "Make SignalStrength#INVALID public" am: f5852d1500 am: f79f209b08
am: 1a909973a2

Change-Id: Ia028c1f9732f882ba85ae4fea8f9abf52ca75a8c
2018-11-01 11:59:02 -07:00
Shuo Qian
1a909973a2 Merge "Make SignalStrength#INVALID public" am: f5852d1500
am: f79f209b08

Change-Id: I765099d1bdf906eb7709b3d83a594ea1febcf599
2018-11-01 11:42:01 -07:00
Shuo Qian
f5852d1500 Merge "Make SignalStrength#INVALID public" 2018-11-01 18:06:25 +00:00
Chen Xu
f5d8e6c793 Revert "Need to check empty not null for String"
This reverts commit 77680bd4db.

Reason for revert: this change caused no wcdma signal bar because "" is a valid default value from carrier config

Bug: 118800169
Change-Id: I0285827c84edda88f7f0d287d254ba89c9931382
2018-11-01 16:41:16 +00:00
chen xu
dbff1bd8e4 refactor resetNv API to resetRadioConfig and rebootRadio
Bug: 116476729
Test: telephony unit test and Manual test
Change-Id: I420da20f2290d1fc3962f7c14a9ca4999eafbde8
Merged-in: I420da20f2290d1fc3962f7c14a9ca4999eafbde8
2018-10-31 22:51:13 -07:00
Chen Xu
cd5b6cfe3b Merge "refactor resetNv API to resetRadioConfig and rebootRadio" 2018-11-01 04:55:19 +00:00
Shuo Qian
ff4c012d91 Merge "Fix lint docs breakage." 2018-11-01 01:45:17 +00:00
Hall Liu
1ce5e6659e Change default of hide LTE+ config to true
Hide the LTE+ icon by default.

Change-Id: I9d9fbc283ac9d5b75df3818191253d84a5e6c36c
Fixes: 118775808
Test: manual
2018-10-31 18:17:38 -07:00
Chuck Liao
d3db069be2 Merge "Add a new carrier config to support emergency dialer shortcut feature." am: c85fa5471d am: 79c683e659
am: d4ff51dd42

Change-Id: I126946625f0c953ef3d0ba83b7889b81ed44cbb2
2018-10-31 17:38:02 -07:00
Chuck Liao
d4ff51dd42 Merge "Add a new carrier config to support emergency dialer shortcut feature." am: c85fa5471d
am: 79c683e659

Change-Id: I05e0367341221111c22fb583625412f1bffeb9aa
2018-10-31 17:28:11 -07:00
Hall Liu
a7d0230572 Add TestApi to get RTT support status
Add a TestApi for CTS to be able to tell whether a device supports RTT
on the current carrier.

Bug: 113069001
Test: manual
Change-Id: I135338b7b83f888d454d09dddd30c72197fe0533
2018-10-31 17:05:07 -07:00
Chuck Liao
c85fa5471d Merge "Add a new carrier config to support emergency dialer shortcut feature." 2018-10-31 23:58:21 +00:00
sqian
d48b024a71 Fix lint docs breakage.
Bug: 112657134
Test: make docs
Change-Id: Ic0a22dd9c2023362bbb65b80cb78990ace7caac4
2018-10-31 16:22:03 -07:00
TreeHugger Robot
09128036f4 Merge "Introduce Emergency number functions APIs" 2018-10-31 21:37:28 +00:00
chen xu
13841a8d83 resolve merge conflicts of 461aef854d to pi-dev-plus-aosp
Bug: 118351153
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib804121f94f2fec404b39b90700092783b6ba58c
Merged-in: I4a71c61929d9df8ec13c157e0452c6f30d8e4b9c
2018-10-31 13:07:11 -07:00
Chuck Liao
3bad37e0be Add a new carrier config to support emergency dialer shortcut feature.
Test: manual
Bug: 117865402
Change-Id: I5d008af8d4dc73adc76630d7b6f47724544f068c
2018-11-01 02:21:07 +08:00
Chen Xu
3ad3478213 Merge "new system API getRadioAccessFamily" 2018-10-31 17:12:23 +00:00
chen xu
c2389322f5 refactor resetNv API to resetRadioConfig and rebootRadio
Bug: 116476729
Test: telephony unit test and Manual test
Change-Id: I420da20f2290d1fc3962f7c14a9ca4999eafbde8
2018-10-31 09:42:20 -07:00
Youming Ye
409b7fd693 Merge "Add CarrierConfig to hide "Network default" option in Caller ID setting" am: e3a989f7d3 am: 22b595e5bd
am: d07819d5cc

Change-Id: Ie07d14e12ef078f2dd87af697229b6c052a3d712
2018-10-30 19:02:26 -07:00
Xiangyu/Malcolm Chen
101f907ddb Merge "Clear calling identity in callback." 2018-10-31 01:38:15 +00:00
Youming Ye
d07819d5cc Merge "Add CarrierConfig to hide "Network default" option in Caller ID setting" am: e3a989f7d3
am: 22b595e5bd

Change-Id: If14fb8996f5cb829fdc0f41ecc7868656195265f
2018-10-30 18:37:59 -07:00
Youming Ye
e3a989f7d3 Merge "Add CarrierConfig to hide "Network default" option in Caller ID setting" 2018-10-31 00:44:04 +00:00
Jack Yu
25b7a917f8 Deprecated the resource config_tether_apndata
The resource has been migrated into the database so we can remove
this resource now.

Test: Telephony sanity tests
Bug: 113942223
Change-Id: I1b65a8bee81f1d190c587cf65cb55da64a184284
2018-10-30 17:39:14 -07:00
Michael Groover
6331237ae7 Merge "Revert "Allow apps with carrier privileges to access device IDs"" 2018-10-30 23:52:59 +00:00
Michael Groover
e13f850925 Revert "Allow apps with carrier privileges to access device IDs"
This reverts commit ec5f77a0d7.

Reason for revert: Change broke the build

Change-Id: Id1a6d35b91e4f547a809d2d222e3f33d51bab990
2018-10-30 23:49:56 +00:00
Michael Groover
f0ca3fec19 Merge "Allow apps with carrier privileges to access device IDs" 2018-10-30 23:06:38 +00:00
sqian
08db0d14d8 Introduce Emergency number functions APIs
- getCurrentEmergencyNumberList
- getCurrentEmergencyNumberList (per categories)
- isCurrentEmergencyNumber

Note: the implementaion from PhoneInterfaceManager is empty, but the names
of the APIs need to be finalized so that the usages and test plan are not
blocked.

Bug: 112657134
Test: Treehugger
Change-Id: I854db34f4378f35f99c3d8133bf35f3d0b3aad2b
2018-10-30 15:41:14 -07:00
Nathan Harold
bc2a1620d7 Merge "Define CellInfo.UNAVAILABLE for Unreported Fields" am: 40745e1def am: ae7dd94d7f
am: 9e6faba5ed

Change-Id: I161cf73348b08c99350295762da7a9ff03de55d2
2018-10-30 12:05:23 -07:00
Nathan Harold
9e6faba5ed Merge "Define CellInfo.UNAVAILABLE for Unreported Fields" am: 40745e1def
am: ae7dd94d7f

Change-Id: I7491584dfba8ccfa8f9835623f766a87268ae1d3
2018-10-30 11:37:43 -07:00
Treehugger Robot
40745e1def Merge "Define CellInfo.UNAVAILABLE for Unreported Fields" 2018-10-30 17:53:24 +00:00
chen xu
eb18644660 new system API getRadioAccessFamily
1. new API in telephonyManager to getRadioAccessFamily
2. define bitmask for radioAccessFamily based on NetworkType because
we don't want to expose two sets of definition RIL_RADIO and Network
type together in public API surface
3. convert definition to NetworkType

Bug: 118351153
Test: telehony unit test
Change-Id: I4a71c61929d9df8ec13c157e0452c6f30d8e4b9c
Merged-in: I4a71c61929d9df8ec13c157e0452c6f30d8e4b9c
2018-10-29 19:00:21 +00:00
Chen Xu
40e6f7ed00 Merge "Revert "Revert "Telephony light grey list clean up for Q""" am: d4e2c6cd5a
am: 39cc174191

Change-Id: I6c8bdd4d4df115abe6fd1914d21019da8930c8be
2018-10-29 11:55:14 -07:00
Chen Xu
469b9d6a84 Merge "new system API getRadioAccessFamily" 2018-10-29 18:07:35 +00:00
Chen Xu
d135468a98 Merge "Add CarrierId column in TelephonyProvider" 2018-10-29 18:04:04 +00:00
Chen Xu
d4e2c6cd5a Merge "Revert "Revert "Telephony light grey list clean up for Q""" 2018-10-29 17:20:48 +00:00
calvinpan
beb6cb3b03 Add CarrierId column in TelephonyProvider
Add a column in provider to migrate mno and mvno to carrierid.

Bug: 115709816
Test: runtest --path tests/src/com/android/providers/telephony/TelephonyProviderTest.java
Change-Id: I9c0c0fd069acc7f182d94f422ff15f45ebf187a9
2018-10-29 19:50:14 +08:00