aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-06Merge "Wire up the stopRtt API"android-o-mr1-iot-release-smart-display-r3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseHall Liu
2018-10-03Merge "Fix ImsManager callback called once registered"Youming Ye
2018-10-01Revert ImsResolver binding checkandroid-o-mr1-iot-release-1.0.5Brad Ebinger
Reverts the ImsResolver in progress binding check. This caused a race condition that would sometimes result in IMS not being registered when SIM swapping to a carrier ImsService that supports RCS only. Bug: 109762920 Test: Telephony Unit/GTS testing Merged-In: I0905dc7472a76900c97e3902a4501ad88c182ce1 Change-Id: I8b6b244b51a4500ecdf59ff2d66ef52e05c87b22
2018-09-28Take into account dummy sub ids in ImsManager verificationBrad Ebinger
Use existing SubscriptionManager verification methods, which also check for dummy sub ids. Test: atest FrameworksTelephonyTests Change-Id: If571083830ef22863790343719504fe961fd46d9
2018-09-27Fix ImsManager callback called once registeredYouming Ye
Register the callbacks to the callback list directly, and remove the localCallback list. Now the MmTelFeature doesn't maintain one connection for each process anymore. Change-Id: I04f363383963e4470ea2195e4b938a7056138d36 Test: Unit Bug: 112677827
2018-09-26Wire up the stopRtt APIHall Liu
Connect the implementation of the onStopRtt API in Connection to the one in the IMS stack. Bug: 116671810 Test: manual Change-Id: Ibfa2d65ad543dfd2883096bfa6ff8b34f617a19d
2018-09-24Speculative fix for ImsManager crashes.Tyler Gunn
It turns out the speculative fix in b/113291931 wasn't capturing the cases which are causing crashes. Dug into the code and realized that the checks performed in SubscriptionController go further than what was done here previously. Replicating the same checks her and logging actual sub Id so we can perhaps get more information as to why this is failing in the field. Test: Build Bug: 115894442 Change-Id: Ifd4fe110ae797c435ce737845af99218fdab5401
2018-09-20Use KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL when VoLTE Setting hiddenHonggang Luo
If "Enhanced 4G LTE Mode" Switch setting is hidden, use the default value specified by KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL as Enhanced 4G LTE Mode setting. Bug: 113346089 Test: Manual Change-Id: Iccb43cedac38364e619ad6f374481799606aba44
2018-08-30Fix SubscriptionController crash during subid verificationandroid-o-mr1-iot-release-1.0.4Brad Ebinger
Receiving reports of ImsManager causing crashes when trying to update settings in the siminfo db related to WFC. This should only be triggered when there is a valid sub id, which causes a crash. There is not enough info in the bugreports to find the root cause, but I can at least fix the phone crash and log an error when this happens. Test: atest FrameworksTelephonyTests Bug: 113291931 Change-Id: I825392c6a8ac1602ac7e5c915b80b41aa6734d27
2018-08-30Merge "Update owners file."Treehugger Robot
2018-08-29Update owners file.Tyler Gunn
Add new team member to owners. Bug: 113528087 Test: Manual Change-Id: I2657d0c2ec3d413fb7e2b356ef851f7cc4e14eb0
2018-08-16Convert frameworks/opt/net/ims to Android.bpColin Cross
See build/soong/README.md for more information. Test: m checkbuild Test: atest ImsCommonTests Change-Id: Ia7813edb90782e5439acda623f934e2acee2fca7
2018-08-09Convert .mk to .bp for imsJason Monk
Test: build Change-Id: Ic40605e4ae9499bfe9a44d38f622e385cebb0520 Merged-In: Ic40605e4ae9499bfe9a44d38f622e385cebb0520 (cherry picked from commit fcdb07aebf851ed749dad8003c6c15cc1ba224fc)
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-1.0.3Xin Li
Bug: 112104996 Change-Id: Ib86285979819c6e539f8e59868e4f0f72fff6213
2018-06-20[automerger skipped] Merge "Handle Dead Objects from Phone Crashes better"temp_p_mergeBrad Ebinger
am: 3bb2a9743c -s ours Change-Id: I70ab2b7ee7cc7a0fc20dc42f3efa31e8dd9250ae
2018-06-20Merge "Handle Dead Objects from Phone Crashes better"android-p-preview-5android-p-preview-4android-o-mr1-iot-release-1.0.2android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayBrad Ebinger
2018-06-13Remove DTMF codes on logXinying
am: 0073fff16f Change-Id: I13dfa6f9106a25f182b8c5c96b163e9b82a4f66c
2018-06-12Remove DTMF codes on logXinying
Remove the logging of the actual DTMF character. Test: manual - Checked that DTMF codes are removed on log. Bug: 110013531 Change-Id: I74c6af4ae3c46d3fab2ff4a234b23929fc7acb66
2018-06-11[automerger skipped] Merge "Fix typo in IMS compat translation code"Brad Ebinger
am: 9acd628881 -s ours Change-Id: I28804ad84d37bb86db77e736bd0b724b62a64ff9
2018-06-11[automerger skipped] Merge "Fix deadlock during Testing"Brad Ebinger
am: 79dca65d9f -s ours Change-Id: Ia2d82c3b20f3e557382a8e24a40f556d5f070314
2018-06-11[automerger skipped] Merge "Update docs for setUiTtyMode and using Message ↵Brad Ebinger
across IPC" am: 36db0d2f57 -s ours Change-Id: Ied0152410c6d0ca210f87cd9b58b86775b40eaa6
2018-06-11Handle Dead Objects from Phone Crashes betterBrad Ebinger
1) Check to make sure ImsService is available when calling changeMmTelCapability. 2) Remove caching of ImsConfig in ImsManager. It is already cached properly in MmTelFeatureConnection. 3) Create a DeathRecipient for MmTelFeature in MmTelFeatureConnection that cleans up all caches and notifies ImsManager that the connection is now unavailable. Bug: 77941698 Test: Manual Merged-In: Ib26ce5308ec75113ad02c281b2a19cba5f94cdac Change-Id: I9c3721fe275a94f7f8841e8e84a2f9d8a3c4823b
2018-06-11Merge "Fix typo in IMS compat translation code"Brad Ebinger
2018-06-11Merge "Fix deadlock during Testing"Brad Ebinger
2018-06-11Merge "Update docs for setUiTtyMode and using Message across IPC"Brad Ebinger
2018-06-11Fix typo in IMS compat translation codeBrad Ebinger
The IMS compat layer had a typo in it, causing code to receive an unexpected result for VoWiFi changes. Bug: 78310624 Test: Manual Merged-In: I775049c49b40a73e4088d86de07d32a4debe0f88 Change-Id: Ib991008fbc3cf6ba7729305bf7dae62c1bad62cc
2018-06-11Fix deadlock during TestingBrad Ebinger
Fixes an issue where rapid setup/teardown of ImsServices and callback registration was causing a deadlock in GTS testing. Bug: 77141737 Test: atest GtsImsServiceTests Merged-In: I1b4fcbc8d3d5ecf9c7c1f22d2d81456446e94ad4 Change-Id: Ie63be1ff1793408039a1facfdb53b706f757543d
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
Bug: 79597307 Change-Id: Idddad9f3c510d51ea4a77c0a439ac00846af7cb9
2018-06-06[automerger skipped] Make sure the mBinder is not null before clearing ↵Brad Ebinger
listener am: b84d40e2c6 am: 61e71d322b -s ours Change-Id: I836eefcd3cb879c640a9c1f7764ff64b492da05d
2018-06-06Make sure the mBinder is not null before clearing listenerBrad Ebinger
am: b84d40e2c6 Change-Id: I6010710f758b90b91e5c67764c74b90bf0cb6b39
2018-06-06Update docs for setUiTtyMode and using Message across IPCBrad Ebinger
Bug: 77870347 Test: Manual Merged-In: I2d45522a198e9e94d02d54004991a9609addda2e Change-Id: I9d3abff727e57dacab2e339a094545de9c46ed68
2018-06-06Make sure the mBinder is not null before clearing listenerandroid-n-iot-release-polk-at1Brad Ebinger
Bug: 77693258 Test: Unit Tests/GTS Tests Merged-In: I485bbd0a6d4f2ba550911d5c4a55eb9936ac7981 Change-Id: I85bae2f073960b81ba0afe791138d2765a7f4ed6
2018-05-30[automerger skipped] Fix editable roaming mode query bug am: d0423bf708Brad Ebinger
am: aa8c7a7d4b -s ours Change-Id: Ic9c824ab6a2a1add2d81beb790532d4f9c845735
2018-05-30[automerger skipped] Do not set WFC mode separately when not editable am: ↵Brad Ebinger
6e5e8259d0 am: a5a7ed817c -s ours Change-Id: Ife4a0cad6d92e62ddf9398cb01435e28e196c2e8
2018-05-30Fix editable roaming mode query bugBrad Ebinger
am: d0423bf708 Change-Id: I066c89d126af5015bc9b5245affcc87bdd7706b6
2018-05-30Do not set WFC mode separately when not editableBrad Ebinger
am: 6e5e8259d0 Change-Id: I4a8e55dda0b3d5b9e338691a738a19852c4467e5
2018-05-30Fix editable roaming mode query bugandroid-o-mr1-iot-release-1.0.1Brad Ebinger
We were querying whether or not the WFC mode was editable, instead of the WFC roaming mode. This was causing the issue where the user was unable to set WiFi preferred mode when the WFC mode was not editable. Bug: 80168790 Test: Manual Change-Id: I8895ee97e7917192305e8ad53fd4de9ce1bfca01 Merged-In: I5f219cdab2bea5ac344252fc0fc5ee849a9fa937
2018-05-30Do not set WFC mode separately when not editableBrad Ebinger
WFC mode was being set separately when setting is not editable. Moved this behavior to getWfcMode so that only one query is made. Bug: 77831154 Test: Manual Change-Id: I4d2cb555522246959654b8c04bec9c9b73bdc947 Merged-In: I556b1c9f44bbd254f6ad3d9770449aee1886a224
2018-05-29[automerger skipped] setWfcSetting: set WFC mode w.r.t. roaming state am: ↵Meng Wang
2c2f093775 am: 516fb162a4 -s ours Change-Id: I60213556b7cc3e50b332eaa798534867f329773f
2018-05-29setWfcSetting: set WFC mode w.r.t. roaming stateMeng Wang
am: 2c2f093775 Change-Id: I500571092515c231d8715f0752ad3383058fba00
2018-05-29Fix editable roaming mode query bugBrad Ebinger
am: df97867f42 Change-Id: I5f219cdab2bea5ac344252fc0fc5ee849a9fa937
2018-05-24Fix editable roaming mode query bugpie-devBrad Ebinger
We were querying whether or not the WFC mode was editable, instead of the WFC roaming mode. This was causing the issue where the user was unable to set WiFi preferred mode when the WFC mode was not editable. Bug: 80168790 Test: Manual Change-Id: I8895ee97e7917192305e8ad53fd4de9ce1bfca01
2018-05-22setWfcSetting: set WFC mode w.r.t. roaming stateMeng Wang
When turing on WFC, WFC mode in modem should also be updated to user set WFC mode: roaming mode if in roaming network or home mode otherwise. The code was using home mode always; so it causes user setting mismatch with modem setting in roaming, if home mode is different from roaming mode. Bug: 77882002 Test: manual - force device in roaming state, and turn on WFC; verify that modem uses roaming mode not home mode. Change-Id: I510aa469736de7a9262a87ec6399f5ca97cb3af1 Merged-In: I510aa469736de7a9262a87ec6399f5ca97cb3af1
2018-05-17Merge "Do not set WFC mode separately when not editable" into pi-devBrad Ebinger
am: 63ab34e7f5 Change-Id: I556b1c9f44bbd254f6ad3d9770449aee1886a224
2018-05-17Merge "Do not set WFC mode separately when not editable" into pi-devBrad Ebinger
2018-05-16Do not set WFC mode separately when not editableBrad Ebinger
WFC mode was being set separately when setting is not editable. Moved this behavior to getWfcMode so that only one query is made. Bug: 77831154 Test: Manual Change-Id: I4d2cb555522246959654b8c04bec9c9b73bdc947
2018-05-01Handle Dead Objects from Phone Crashes betterBrad Ebinger
am: 6d1186c2fd Change-Id: Ib26ce5308ec75113ad02c281b2a19cba5f94cdac
2018-04-26Handle Dead Objects from Phone Crashes betterBrad Ebinger
1) Check to make sure ImsService is available when calling changeMmTelCapability. 2) Remove caching of ImsConfig in ImsManager. It is already cached properly in MmTelFeatureConnection. 3) Create a DeathRecipient for MmTelFeature in MmTelFeatureConnection that cleans up all caches and notifies ImsManager that the connection is now unavailable. Bug: 77941698 Test: Manual Change-Id: I9c3721fe275a94f7f8841e8e84a2f9d8a3c4823b
2018-04-25Fix typo in IMS compat translation codeBrad Ebinger
am: 01720f2325 Change-Id: I775049c49b40a73e4088d86de07d32a4debe0f88
2018-04-24Fix typo in IMS compat translation codeBrad Ebinger
The IMS compat layer had a typo in it, causing code to receive an unexpected result for VoWiFi changes. Bug: 78310624 Test: Manual Change-Id: Ib991008fbc3cf6ba7729305bf7dae62c1bad62cc
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 14:52:46 +0000