Commit Graph

3809 Commits

Author SHA1 Message Date
Jordan Liu
1d67d022fb Merge "Fix naming of key" am: 0b74a1dabb
am: c68c2f6885

Change-Id: Ibdd5177ea43ee9c2ea5603363429a7207a59d5ba
2017-01-10 23:44:43 +00:00
Jordan Liu
7c4bfb28d1 Fix naming of key
CarrierConfig Keys should start with "KEY_".

Test: runtest carrierconfig-unit
Change-Id: I317cdb53a09851a5e1a3832140c7dc28a5cde4a4
Merged-In: Iebb11739ae16e56fe1a0b2fdc9a3e005a71858dc
2017-01-04 14:46:29 -08:00
Robert Greenwalt
e6b6653da8 Merge "Add IMEI_NOT_ACCEPTED disconnect cause" am: 43ced5941e
am: 14a5b810b6

Change-Id: Ib7a87a5028975e8f55dd6ba311cde78a3c1c2460
2017-01-03 17:40:27 +00:00
Robert Greenwalt
43ced5941e Merge "Add IMEI_NOT_ACCEPTED disconnect cause" 2017-01-03 17:26:59 +00:00
Joe LaPenna
715acea102 Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f
am: 6f87331902

Change-Id: I3681893e43949060922f72c65f8f106090005d14
2016-12-22 21:47:00 +00:00
Joe LaPenna
5e0164e16c Add simplified_network_settings_bool to CarrierConfig.
Some carriers want to further simplify network settings based on a
variety of wifi or cellular related bundles. Expose a config a
carrier might set to allow SysUi, Settings and platform to adjust.

BUG: 33111931
Test: runtest carrierconfig-unit
Change-Id: I35a7ef15bbba23cf9e0380432fc001804c7e1804
Merged-In: I35a7ef15bbba23cf9e0380432fc001804c7e1804
2016-12-22 11:53:10 -08:00
Hall Liu
57c781417f Merge "Adds carrier config to determine if high definition audio is displayed" am: 26e5096364
am: fc125a319e

Change-Id: I305223c2a5499b9fdf2f1f59ddfda40712cd6172
2016-12-20 21:28:12 +00:00
Hall Liu
26e5096364 Merge "Adds carrier config to determine if high definition audio is displayed" 2016-12-20 21:13:31 +00:00
Polina Bondarenko
bab9a7e66e Merge "Make TelephonyManager APIs public:" am: 441bfc6718
am: 104a5c7a34

Change-Id: I0d234fd2539a3a9ec58c820a7a7428430aa2255a
2016-12-16 10:45:03 +00:00
Treehugger Robot
441bfc6718 Merge "Make TelephonyManager APIs public:" 2016-12-16 10:29:04 +00:00
Wei Huang
f294be149a Adds carrier config to determine if high definition audio is displayed
Adds a carrier config option to remove HD audio property from a
connection so that HD audio related UI is not displayed
even if connection has High Definition audio support.

Bug: 28654645
Bug: 33062999
Change-Id: Ie2acb3be556b750849c25b856cf9382cf4ebb8d9
Merged-In: I71f35854d35ae73741a36c0e2106695b04471b2e
2016-12-15 15:56:24 -08:00
Polina Bondarenko
a6dba0ab35 Make TelephonyManager APIs public:
TelephonyManager.getSimState(slotIdx) and
TelephonyManager.SIM_STATE_CARD_RESTRICTED.

It is needed for OobConfig app unbundling.

Bug: 33479833
Test: run cts -m CtsTelephonyTestCases
Change-Id: I375f436bc4e1dcedc0656866a0838c7bf5948422
2016-12-13 21:37:01 +01:00
Joe LaPenna
b52989c736 Merge "Add simplified_network_settings_bool to CarrierConfigManager." am: 9b430e0395
am: 2bc66bf601

Change-Id: Idaa23641c8e95890271c554dee0244702601a109
2016-12-12 21:34:30 +00:00
Joe LaPenna
2b22ae3b87 Add simplified_network_settings_bool to CarrierConfigManager.
BUG: 33111931
Test: runtest carrierconfig-unit
Change-Id: I3da3048afcf1547c46db5c76ff68165246faa77a
2016-12-12 19:27:16 +00:00
Johan Redestig
87b29367a2 Add IMEI_NOT_ACCEPTED disconnect cause
Bug: 33263903
Test: manual (simulated error code from the network)
Change-Id: I3c01b0ad5d55f30b4a52845f09c801358e977a01
2016-12-08 13:04:46 +01:00
Robert Greenwalt
2232ac8c59 Merge "Get the correct operator name"
am: 297e9f9a32

Change-Id: Ic4c433e9b7e70427275fbbba785bb365e0ced8d5
2016-12-02 03:39:30 +00:00
Robert Greenwalt
297e9f9a32 Merge "Get the correct operator name" 2016-12-01 23:29:28 +00:00
Zoran Jovanovic
47495ebad0 Get the correct operator name
If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Merged-In: I4983ad708c57a650ce4a806e1f53837825bad2db
Depends-On: commit in frameworks/opt/telephony with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
2016-12-01 21:50:14 +00:00
Zoran Jovanovic
67f579be19 Get the correct operator name
If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Test: ServiceStateTrackerTest.java exteneded in partner cl
Depends-On: commit in frameworks/opt/telephony with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
2016-12-01 10:36:21 -08:00
nharold
64a8a387a4 Merge "Expose GSM Timing Advance, Update LTE TA docstring" am: 4134ccb214
am: 8fabfd639e

Change-Id: I6d69cc6ce34ed1acf1f19e760631850b2cf2446c
2016-12-01 00:07:20 +00:00
Jordan Liu
0672ea446d resolve merge conflicts of a578ae2 to stage-aosp-master
am: cee0c941ed

Change-Id: I39f3256a13117c2afe6872f58f57c18c308eab30
2016-12-01 00:00:55 +00:00
nharold
8fabfd639e Merge "Expose GSM Timing Advance, Update LTE TA docstring"
am: 4134ccb214

Change-Id: Ic60953cebd3209b1320ed4b6723809d0421ebc27
2016-12-01 00:00:09 +00:00
Jordan Liu
cee0c941ed resolve merge conflicts of a578ae2 to stage-aosp-master
Change-Id: I344ce44711edee385c64de4e6c52c64e6901820d
2016-11-30 15:08:13 -08:00
nharold
4134ccb214 Merge "Expose GSM Timing Advance, Update LTE TA docstring" 2016-11-30 18:00:35 +00:00
Jordan Liu
a578ae2aa1 Merge "Add KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY" 2016-11-30 17:42:31 +00:00
Jeff Davidson
b369ad4b19 Merge "Expose TelephonyManager#{set,get}DataEnabled." am: 99d6227782
am: fa8e6c0f5a

Change-Id: I55d2e8ffcf70aad48acdf1fa97da5b2874d26925
2016-11-23 04:06:07 +00:00
Jeff Davidson
fa8e6c0f5a Merge "Expose TelephonyManager#{set,get}DataEnabled."
am: 99d6227782

Change-Id: Iacdd6d802725ab1b45c273ad7c8de7c85c8cb801
2016-11-23 04:01:22 +00:00
Jeff Davidson
40db40878e Expose TelephonyManager#{set,get}DataEnabled.
setDataEnabled requires MODIFY_PHONE_STATE or carrier privileges.
getDataEnabled will work with any of the above or
ACCESS_NETWORK_STATE.

Merged-In: I2d5a9df2e55f3f7be1729abefe137c00ae1d6c4e
Test: Exercised APIs from test app, updated and executed CTS tests
Change-Id: I2d5a9df2e55f3f7be1729abefe137c00ae1d6c4e
Fixes: 32644451
2016-11-22 17:28:57 -08:00
Ta-wei Yen
f05c651c99 Merge "Make voicemail notification broadcast public" am: 6a56326109
am: 9b614baeab

Change-Id: Icb636f5155c3b25a3db2978fad830fb94b959a2f
2016-11-22 01:38:56 +00:00
Ta-wei Yen
9b614baeab Merge "Make voicemail notification broadcast public"
am: 6a56326109

Change-Id: Ic094db50e40a0cd46251e27f84b2a98b9040a192
2016-11-22 01:32:00 +00:00
Treehugger Robot
6a56326109 Merge "Make voicemail notification broadcast public" 2016-11-21 22:23:13 +00:00
Mats 2, Åkesson
a16a77781e Merge "Customization of LTE Signal Bars" am: 3cbf2c2657
am: 5ee2b9384b

Change-Id: I82d61b23560e4bdf84caca7e49ddcd367662cb47
2016-11-18 20:56:03 +00:00
Mats 2, Åkesson
5ee2b9384b Merge "Customization of LTE Signal Bars"
am: 3cbf2c2657

Change-Id: I33c625ec49547fde582462687e6229ddf0269b15
2016-11-18 20:50:20 +00:00
Treehugger Robot
3cbf2c2657 Merge "Customization of LTE Signal Bars" 2016-11-18 20:44:14 +00:00
Ta-wei Yen
73cdcf5787 Make voicemail notification broadcast public
Fixes: 32884372
Bug: 32414216
Test: CTS Verifier -> Telephony -> Voicemail Broadcast Test

Change-Id: Id11d68bc154517a0965c8368a85013128e6b0b58
2016-11-14 16:48:23 -08:00
Jack Yu
d517ea753f Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API" am: 4469e48d5c
am: 3cfa510779

Change-Id: I65746e4959851eb4662881db4fd8d9665070da71
2016-11-11 19:57:55 +00:00
Jack Yu
3cfa510779 Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API"
am: 4469e48d5c

Change-Id: Id92b8eaeec12885af3748d1e839da1a5560e2619
2016-11-11 19:51:23 +00:00
Jack Yu
4469e48d5c Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API" 2016-11-11 19:41:46 +00:00
Ta-wei Yen
c9698a5cff Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state" am: 0a3b6b70dd
am: 969a6eb2b8

Change-Id: I2a5d31c342efc7e3ca4f29448b24d406253c7b0f
2016-11-10 22:08:35 +00:00
Ta-wei Yen
969a6eb2b8 Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state"
am: 0a3b6b70dd

Change-Id: I512e68bccda115ad7c58ec1f1fbfbb2c69c86578
2016-11-10 22:02:17 +00:00
Nathan Harold
90bc8e30ad Expose GSM Timing Advance, Update LTE TA docstring
-Expose the GSM timing advance
-Add a spec reference to the LTE Timing Advance

Bug: 28910982
Test: None
Change-Id: I7573dbb1316a2ab52051072ebad2532601f4299c
2016-11-10 13:00:21 -08:00
Ta-wei Yen
05f9112d15 Add createForPhoneAccountHandle() and getServicetate()
Respect TelephonyManager's subId when listening to phone state

TelecomManager perfers to use a PhoneAccountHandle to represent a
account but TelephonyManager prefers subscription IDs.

This CL added createForPhoneAccountHandle() in TelephonyManager so
telephony values can be queried from it.

Currently the ServiceState can be retrieved through registering a
PhoneStatelistener, but it is a callback which the handler cannot be
specified.

getServiceState() is added to allow the ServiceState to be polled.

While TelphonyManager has createForSubscriptionId(), listen() does not
respect the subId on the manager created from it, and will always use
the hidden subId on the listener, which is always the default subId
through public API.

After this CL, the default subId on the listener will null.
TelephonyManager use its' own subId if the listener does not set the
subId to something else.

Bug: 32637799
Bug: 32414216
Test: cts-tradefed run cts-dev --module CtsTelephonyTestCases
Change-Id: I9995e4da1573cf1f6b6e4acf2daf7a538fb60d5f
2016-11-10 12:11:56 -08:00
Kevin Su
211c1c2ca8 Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte.
Regenerate api accordingly.
BUG: 32609966
Test: CTS Testing new API

Change-Id: I2603fc0001f31ff23f02f4fdf2a72b33f2750a4c
2016-11-09 13:27:20 -08:00
Jordan Liu
d109a6b2cd Add KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY
Add the key to CarrierConfigManager and remove the old configs which are
no longer needed.

Bug: 29873049
Change-Id: I2197cabca2addbbbe15f0f13985a6f5d8794d64a
Merged-In: I2197cabca2addbbbe15f0f13985a6f5d8794d64a
2016-11-08 11:15:20 -08:00
pengzhicai
d7df704d98 Merge "Fix String is empty issue" am: 80af1ba47b
am: 38c585cb8d

Change-Id: I091572280b0b2a33a2a5e2339a08df0759bb2bd7
2016-11-02 18:29:24 +00:00
pengzhicai
38c585cb8d Merge "Fix String is empty issue"
am: 80af1ba47b

Change-Id: I7000d0fe8fd5c2145e628abec11b49653027138b
2016-11-02 18:23:26 +00:00
pengzhicai
7c30bb8e0f Fix String is empty issue
Maybe the string is empty
https://code.google.com/p/android/issues/detail?id=226739

Change-Id: I645ae05a8cbe316e29d9710de0bbba64c0c2275d
Signed-off-by: pengzhicai <pengzhicai@xiaomi.com>
2016-11-02 09:42:44 +08:00
Jordan Liu
ff13cc20fe resolve merge conflicts of ab00546 to stage-aosp-master
am: bc2af49c21

Change-Id: I95cfcd3907105ef1969f02bf1229ba0c5eb9b8c7
2016-10-26 20:12:56 +00:00
Jordan Liu
bc2af49c21 resolve merge conflicts of ab00546 to stage-aosp-master
Change-Id: Ief51ceeeae7a11e26dd2c53411ce67e6d0e6bd49
2016-10-26 12:05:27 -07:00
Jordan Liu
ab005465b6 Merge "Add key to CarrierConfigManager" 2016-10-26 17:50:45 +00:00