aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-21Snap for 4657601 from 90abd14221f12375b113ea3b40d597f78925eac4 to oc-m4-releaseandroid-8.1.0_r67android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r53android-8.1.0_r51android-8.1.0_r48android-8.1.0_r45android-8.1.0_r42android-8.1.0_r40android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r32android-8.1.0_r31android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27oreo-m8-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseandroid-build-team Robot
Change-Id: Ie307e80319e429f5e605af25d9f1858a09af5477
2017-09-12release-request-dabd8cf7-7af2-48e9-a296-ccc6a71cc25d-for-git_oc-m2-release-4 ↵android-8.1.0_r8android-8.1.0_r52android-8.1.0_r50android-8.1.0_r47android-8.1.0_r46android-8.1.0_r43android-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20android-8.1.0_r2oreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseandroid-build-team Robot
328410 snap-temp-L55300000101694322 Change-Id: I13647420b3816b6bed2ded16d778165b311bd309
2017-09-08release-request-8cd2a23c-f767-488e-8139-390d1636483f-for-git_oc-mr1-release- ↵android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-releaseandroid-build-team Robot
4323561 snap-temp-L80400000100600189 Change-Id: I2f9d33eb95868d3712e39aff7e439cb7d7a1c1f4
2017-09-06Prevent IMS call merge if the peer call has a pending update request.oreo-mr1-devTyler Gunn
Currently, if the user requests merge, and the call they request the merge on is in the midst of some other pending operation (e.g. hold, resume), the system will prevent the merge from taking place. The logic, however does not account for the fact that the background call being merged into the foreground call could also be engaged in some other update operation. Added code to ensure that both calls are not actively engaged in some pending operation. Test: Manual Change-Id: Icc2f3786865345435bbf138b54736fc6f09c0aa4 Fixes: 63764631
2017-09-03release-request-957cd691-fb71-4770-8ff7-a3b9602655a5-for-git_oc-mr1-release- ↵android-build-team Robot
4314464 snap-temp-L54400000099147910 Change-Id: Ib6cada36b85a6aaec410fb2e9e3a08dde94038b4
2017-08-31Merge "Ensure upgrade to video requests are ignored when video disabled." ↵Tyler Gunn
into oc-mr1-dev
2017-08-31release-request-fd631211-effa-4885-9314-559fcbd0a094-for-git_oc-mr1-release- ↵android-build-team Robot
4308825 snap-temp-L52700000098265170 Change-Id: Ic5e7c6849c62d6d2e833390818de196b41b44f0f
2017-08-29Adds Exponential backoff for provisioning resultsBrad Ebinger
ImsService initialization can take longer than telephoyn initialization in some cases, which causes ImsConfig queries to return with an error. This change adds an exponential backoff for querying provisioning results from ImsConfig if we get an error during initialization. Bug: 64540800 Test: Manual Change-Id: I2193e42736994de3cce6fb24ee1dcc9e936bebf0
2017-08-23Pin IMS on/off to actual TTY mode am: e511a2031e am: 4801a7a0a9 am: ↵Hall Liu
b3d249ba99 am: 33f853dfb6 am: 3f444a6a8c Change-Id: I18ca42d2fbe9a074c1d8a0e9429bbb500619a92c
2017-08-23Pin IMS on/off to actual TTY mode am: e511a2031e am: 4801a7a0a9 am: b3d249ba99Hall Liu
am: 33f853dfb6 Change-Id: Ifd6ce2d8494b68e3ac1cb0b26b0d50f2730bac28
2017-08-22Pin IMS on/off to actual TTY mode am: e511a2031e am: 4801a7a0a9Hall Liu
am: b3d249ba99 Change-Id: I0a13d9215bcb6068fa83337833ffd9bcbe17f657
2017-08-22Pin IMS on/off to actual TTY mode am: e511a2031eHall Liu
am: 4801a7a0a9 Change-Id: Id290b10c204301bd0eeabda53759f8148e144db0
2017-08-22Pin IMS on/off to actual TTY modeHall Liu
am: e511a2031e Change-Id: I46d1438bf8170418901b17933895d02ab6b88906
2017-08-22Pin IMS on/off to actual TTY modeHall Liu
Make changes to only toggle IMS on/off if the actual TTY option is on (i.e. UI preference is enabled and TTY accessory is plugged in) Test: manual Change-Id: Ieac0ca041a0bd026e8b2f07ebcadc9a6a1db75b9 Fixes: 63968802
2017-08-20release-request-369362fc-cc6c-4cb1-95c0-90b5ac7c52cb-for-git_oc-mr1-release- ↵android-build-team Robot
4288633 snap-temp-L81700000095141745 Change-Id: I3fb48534f4e796b1db77a8b8bdc2d369bda9203a
2017-08-18Pin IMS on/off to actual TTY mode am: 1a252db653Hall Liu
am: b7fa40ccde Change-Id: Id78bbde4158902d7ec95b638c872a355cf3ef992
2017-08-18Pin IMS on/off to actual TTY modeHall Liu
am: 1a252db653 Change-Id: I4ac88712d88ea1349c4005f23a051b99c22e5f9c
2017-08-18Pin IMS on/off to actual TTY modeHall Liu
Make changes to only toggle IMS on/off if the actual TTY option is on (i.e. UI preference is enabled and TTY accessory is plugged in) Test: manual Change-Id: Ieac0ca041a0bd026e8b2f07ebcadc9a6a1db75b9 Fixes: 63968802
2017-08-17Ensure upgrade to video requests are ignored when video disabled.Tyler Gunn
When video is disabled (due to mobile data being off), we will automatically reject any incoming requests to upgrade to video. Test: Manual Bug: 36900451 Change-Id: I9991cc9940aef417ec7f05cb61e777bf0d354c93
2017-08-17Update ImsRegistrationListener am: a8f627deea -s ours am: c3d1880ed7 -s ↵Meng Wang
ours am: fb38165516 -s ours am: af2d361ca7 -s ours am: 825507b50b -s ours Change-Id: I41f720eb8a7ba8e2523382cee400606eea6b6bbf
2017-08-16Update ImsRegistrationListener am: a8f627deea -s ours am: c3d1880ed7 -s ↵Meng Wang
ours am: fb38165516 -s ours am: af2d361ca7 -s ours Change-Id: I5feab59a3ef278d8126c40261b4cea86ff44992b
2017-08-16Update ImsRegistrationListener am: a8f627deea -s ours am: c3d1880ed7 -s oursMeng Wang
am: fb38165516 -s ours Change-Id: If843b1613311073cb87b6d30ea8180bdee9aaba2
2017-08-16Update ImsRegistrationListener am: a8f627deea -s oursMeng Wang
am: c3d1880ed7 -s ours Change-Id: I737c400c9dda11a94d8916d5fbeb02c5677546ea
2017-08-16Update ImsRegistrationListenerMeng Wang
am: a8f627deea -s ours Change-Id: I21f67eafc9098eadb2e5a0119b1ad25c937941e0
2017-08-16Update ImsRegistrationListenerMeng Wang
1. Replace onImsConnected() with onImsConnected(int) 2. Replace onImsProgressing() with onImsProgressing(int) 3. Add registrationChangeFailed() Bug: 33430556 Test: m Merged-In: I14c171494bdcb0d82ed4be0caff8cb52d35421cc Change-Id: I14c171494bdcb0d82ed4be0caff8cb52d35421cc
2017-08-15Merge "Add workaround for broken vendor camera on/off requests." am: ↵Tyler Gunn
4c0a963a11 -s ours am: feb4c40b2f -s ours am: bf46fafe6b -s ours am: de0acaae42 -s ours am: a70c867cbb -s ours Change-Id: Iee95d5c447b5e60a6e4a4fe47146d7dbffa2a6d5
2017-08-15Merge "Add workaround for broken vendor camera on/off requests." am: ↵Tyler Gunn
4c0a963a11 -s ours am: feb4c40b2f -s ours am: bf46fafe6b -s ours am: de0acaae42 -s ours Change-Id: Ie7bbbd38bffc2c8985562c8c6c83e18a8693de86
2017-08-15Merge "Add workaround for broken vendor camera on/off requests." am: ↵Tyler Gunn
4c0a963a11 -s ours am: feb4c40b2f -s ours am: bf46fafe6b -s ours Change-Id: Icd614f00d976be163e918134392383d04991e1fd
2017-08-15Merge "Add workaround for broken vendor camera on/off requests." am: ↵Tyler Gunn
4c0a963a11 -s ours am: feb4c40b2f -s ours Change-Id: I8bcbf272cf87bab70e3f253dc7392a5af3389104
2017-08-14Merge "Add workaround for broken vendor camera on/off requests."Tyler Gunn
am: 4c0a963a11 -s ours Change-Id: Id0e47ff1a27f8676cbbb1d675a858a85854339fa
2017-08-14Merge "Add workaround for broken vendor camera on/off requests."android-o-iot-preview-5o-iot-preview-5Treehugger Robot
2017-08-14Add workaround for broken vendor camera on/off requests.Tyler Gunn
Scenario: A and B are in video call. A goes to the background, pausing the video. B attempts to turn off their camera. The request fails to be interpreted by vendor code. Reason: This SHOULD really be a request to go from/to: Audio/TX/RX/Paused --> Audio/RX/Paused However, it MUST be sent as: Audio/TX/RX/Paused --> Audio/RX The introduction of the VideoPauseTracker in N caused the request to be sent in the former correct format rather than the latter incorrect format. The VideoPauseTracker attempts to ensure that a request to pause sent by the framework vs the incall ui are kept in sync (we use pause to disable video on a call when the data limit is reached). In the process of ensuring pause and resume requests were handled properly, this code was fixing the malformed request. Added a workaround to the code to ensure the requests remain in the same broken format vendor code depends on. Test: Manual, unit Bug: 35304446 Merged-In: I9b974542234d3f567aba3f2996a815e39bc8963e Change-Id: I9b974542234d3f567aba3f2996a815e39bc8963e
2017-08-11Check Various IMS interfaces before returning cached value am: 138b4a620d ↵Brad Ebinger
am: fa3df0bc9e am: c41dd5079d -s ours am: ec046469d1 -s ours am: 53b731a9db -s ours Change-Id: Ieb9226c3cf045a9ca49f9d1c32fd1d2f8152695e
2017-08-10Check Various IMS interfaces before returning cached value am: 138b4a620d ↵Brad Ebinger
am: fa3df0bc9e am: c41dd5079d -s ours am: ec046469d1 -s ours Change-Id: I87615779c7b246add0a01e2d71c232ae8af8dd62
2017-08-10Check Various IMS interfaces before returning cached value am: 138b4a620d ↵Brad Ebinger
am: fa3df0bc9e am: c41dd5079d -s ours Change-Id: I7c4c942a78db9e3c428dc301db5612b3824614ca
2017-08-10Check Various IMS interfaces before returning cached value am: 138b4a620dBrad Ebinger
am: fa3df0bc9e Change-Id: I11551ae94cd69532a81b8c0d43f5cfbc901f28b5
2017-08-10Check Various IMS interfaces before returning cached valueBrad Ebinger
am: 138b4a620d Change-Id: Ib617c2dfe895286a817fb06675c5510d071012c5
2017-08-09Check Various IMS interfaces before returning cached valueBrad Ebinger
If the ImsService goes down, the stale binder interfaces to the old service still get returned by ImsManager. This change triggers the ImsManager to fetch the binder interfaces again if the cached one is dead. Bug: 62723694 Test: Manual, test procedure outlined in bug Merged-In: I90e3df344785a5bc3818bc9bb24a2735f068058a Change-Id: I64c1c668602d88663220a50c2e45ae4f970ac302
2017-07-18release-request-e04bb055-13fc-41a1-8a9f-7fb10894ec3d-for-git_oc-mr1-release- ↵android-build-team Robot
4189380 snap-temp-L90600000083186678 Change-Id: I8bebdfb2383ac3e56b4fefb79a08e5e35ac7d2d8
2017-07-17Filter resume requests when video is already resumed. am: 28552fbbf0Tyler Gunn
am: 8795220e73 Change-Id: Ibbf15360f0961c9b0bd66477a95f4ff9abc1b211
2017-07-17Change how unpause of video is detected. am: 567a70c96dTyler Gunn
am: 0b5242f5c8 Change-Id: I16fbcd6d1542b8b01d033c8ffd1f2c19d8185c1f
2017-07-17Filter resume requests when video is already resumed.Tyler Gunn
am: 28552fbbf0 Change-Id: I4992a41ae4a1099a08ff6a2cef32b1200bd8a3c2
2017-07-17Change how unpause of video is detected.Tyler Gunn
am: 567a70c96d Change-Id: I35a50f702a8055ece40ee444a645f38515553681
2017-07-14Filter resume requests when video is already resumed.oreo-dr1-devTyler Gunn
If the request being sent to the video provider is to resume the video, but the video stream is already resumed, do not send this request to the modem. In the case of swapping between calls, the video appears to resume automatically on the modem-side, so sending another resume request is redundant. Also, in VideoPauseTracker, correcting the case where we get a resume request, but there are no remaining pause requests in the tracker. Although that case shouldn't run up in reality, if it did we should still let the resume request pass along (since it would otherwise be re-written as a pause). Test: Manual test. Change-Id: Ib9b9acaf2d92b1485e4766a13701fd472d6c117d Fixes: 63606238
2017-07-14Change how unpause of video is detected.Tyler Gunn
ImsVideoCallProviderWrapper was modified recently to check for the case where the video is paused, and the video state changes to an unpaused state. It used this to trigger a clear of the video pause tracker. It did this by checking if the video pause tracker thought the video was paused. In reality, it makes more sense for a change in the videostate from paused to unpaused to be detected, and THAT used as a basis to clear the video pause tracker. The previous functionality caused a problem when the user, in quick succession: 1. Turned off the camera 2. Went to the background. The two requests would hit the framework, causing the video pause tracker to record the current video state as paused (as requested by the user). Shortly thereafter, the modem reports the fact that the camera is off with a state of Audio RX. This would be misinterpreted and cause the pause tracker to be cleared. Test: Manually tested the bug, as well as regression tested b/62784036. Change-Id: Iaa736e93e05ef3ae5dec21cd8ebc18be464f18ae Fixes: 63410964
2017-07-09release-request-fda658d8-eecf-4c78-a2e9-e5093ca10451-for-git_oc-mr1-release- ↵android-build-team Robot
4165363 snap-temp-L49300000080728237 Change-Id: Ib2949b66c58ec664f36cbb8f777d003c78aa951d
2017-07-07Merge "Change how unpause of video is detected."TreeHugger Robot
2017-07-07Remove framework performance optimization for null video requests. am: ↵Tyler Gunn
efa7be99a6 am: f1138ad69d Change-Id: Idf88846a5cb3e89a4256475ca8579ab43ba1c2ec
2017-07-07Remove framework performance optimization for null video requests.Tyler Gunn
am: efa7be99a6 Change-Id: I99b53926105c689ac19c8805035061e106a8f0a1
2017-07-07Change how unpause of video is detected.Tyler Gunn
ImsVideoCallProviderWrapper was modified recently to check for the case where the video is paused, and the video state changes to an unpaused state. It used this to trigger a clear of the video pause tracker. It did this by checking if the video pause tracker thought the video was paused. In reality, it makes more sense for a change in the videostate from paused to unpaused to be detected, and THAT used as a basis to clear the video pause tracker. The previous functionality caused a problem when the user, in quick succession: 1. Turned off the camera 2. Went to the background. The two requests would hit the framework, causing the video pause tracker to record the current video state as paused (as requested by the user). Shortly thereafter, the modem reports the fact that the camera is off with a state of Audio RX. This would be misinterpreted and cause the pause tracker to be cleared. Test: Manually tested the bug, as well as regression tested b/62784036. Change-Id: Iaa736e93e05ef3ae5dec21cd8ebc18be464f18ae Fixes: 63410964