aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-05Merge "Wire up the stopRtt API"pie-tempHall Liu
am: f23cfaba39 Change-Id: I6f7496d4865878e8f5fa2c90e671066c556b475e
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
am: e88480f676 Change-Id: I9a176dbcae852df969dccd9a8d8cc28fd4d6026c
2018-10-03Merge "Fix ImsManager callback called once registered"Youming Ye
2018-10-01[automerger skipped] Revert ImsResolver binding checkBrad Ebinger
am: d3ada02c12 -s ours Change-Id: Ifc04d644955eda10e2efdd28d3fe330fc266696b
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
am: 08059425be Change-Id: I1508e3f7a6ff392d42045b5786c254e56783439a
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-25Speculative fix for ImsManager crashes.Tyler Gunn
am: eb338034f7 Change-Id: Ida64606ed5a75cb39f88fc43c7b0aa82def4d6f3
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-21Use KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL when VoLTE Setting hiddenHonggang Luo
am: 0b38a4b98d Change-Id: I6e0801c7a102f96584d44d2e7a994e37da72f2d6
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-31Fix SubscriptionController crash during subid verificationBrad Ebinger
am: 439561ad21 Change-Id: I30d75aa126fa943487ad09f9b8d9eff619cbe1ec
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-29Merge "Update owners file."Tyler Gunn
am: ca8166fba2 Change-Id: I5f56146182922bb50eb9ede9aec95285a577475e
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-17Convert frameworks/opt/net/ims to Android.bpColin Cross
am: 2bf7a91716 Change-Id: If48ece2afdb2233518ccda5878606ff7169152d5
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-13Merge stage-dr1-aosp-master into stage-aosp-masterXin Li
Bug: 112535855 Change-Id: Iab94366a9d485261bf1146ae064f9c59827fc0ac
2018-08-13Convert .mk to .bp for ims am: dedacb65a0Jason Monk
am: c20b4680c6 Change-Id: I776e50466b8e14f04396b0642b57ce309a579c9c
2018-08-13Convert .mk to .bp for imsJason Monk
am: dedacb65a0 Change-Id: I7c9edc24e9dd2b9fa675514e29cadf99aabdcfae
2018-08-09Convert .mk to .bp for imsJason Monk
Test: build Change-Id: Ic40605e4ae9499bfe9a44d38f622e385cebb0520 Merged-In: Ic40605e4ae9499bfe9a44d38f622e385cebb0520 (cherry picked from commit fcdb07aebf851ed749dad8003c6c15cc1ba224fc)
2018-08-07Merge Android Pie into master am: e7a4144a5fXin Li
am: c20e40925d Change-Id: Ife0a1ca875abaed138de8377380f900cae361f54
2018-08-07Merge Android Pie into masterXin Li
am: e7a4144a5f Change-Id: I93c763bbed9b1e976e2af0ada576bb5264781008
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-1.0.3Xin Li
Bug: 112104996 Change-Id: Ib86285979819c6e539f8e59868e4f0f72fff6213
2018-07-19Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-masterXin Li
am: cdde906f38 Change-Id: Icd35a7297e3de3fe98a266cdabaa6003e4ca7bcf
2018-07-19Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-masterXin Li
Bug: 111615259 Change-Id: Iba79f9714508b1d7142f064464d4f824ac45ec63
2018-07-10Sync RTT config from framework to Modem.tom hsu
am: 938ef90c79 Change-Id: I59c218a33987da887b1e7b39415b7e628ca58b66
2018-07-11Sync RTT config from framework to Modem.android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-devpie-b4s4-releasepie-b4s4-devtom hsu
1st. For this update, when updateImsServiceconfig is in process, it add updateRttConfigValue to sync RTT config. It can solve if RTT config change before factory reset or flash ROM, RTT config in modem side would be different from framework side. 2nd. To prevent VoLTE config out of sync with modem from RTT switch change. When RTT config turn on, it will use setEnhanced4gLteModeSetting instead of setAdvanced4GMode for VoLTE config sync. When RTT config turn off, it will depend on user's config to decide VoLTE on or off. Bug: b/110891445 Test: 1. Manual flip RTT switch and MobileData switch to obserb updateImsServiceConfig for checking RTT sync process. 2. Do factory reset and check solution in process. 3. Make a RTT call to check config is synced and RTT is work. Change-Id: Ie44b783d54cc605ba383a3e402df8dea25131919
2018-06-20[automerger skipped] Merge "Handle Dead Objects from Phone Crashes better" ↵Brad Ebinger
am: 3bb2a9743c -s ours am: a141349098 -s ours Change-Id: I031b795e3da677bab85c74c6b6caecccac84502a
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-19Revert ImsResolver binding checkBrad Ebinger
am: d91de52695 Change-Id: I0905dc7472a76900c97e3902a4501ad88c182ce1
2018-06-19Revert ImsResolver binding checkBrad 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 Change-Id: I8b6b244b51a4500ecdf59ff2d66ef52e05c87b22 Merged-In: I8b6b244b51a4500ecdf59ff2d66ef52e05c87b22
2018-06-13Remove DTMF codes on log am: 0073fff16fXinying
am: 011347baf0 Change-Id: I57ccb95c755d1c27b7b86ff7294258ee9afb77bd
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" am: ↵Brad Ebinger
9acd628881 -s ours am: 65cb6b06ab -s ours Change-Id: I2135af7ecd568e37c128d1cea83126cc5c732ac1
2018-06-11[automerger skipped] Merge "Fix deadlock during Testing" am: 79dca65d9f -s oursBrad Ebinger
am: fcc5d04a3c -s ours Change-Id: Ic3d4caba6ac83e83ab05e0287a4ef6f381a014ec
2018-06-11[automerger skipped] Merge "Update docs for setUiTtyMode and using Message ↵Brad Ebinger
across IPC" am: 36db0d2f57 -s ours am: 7e026d1b08 -s ours Change-Id: I3d0bc989594ef27d23653817da2082bcda6ace78
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