aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-02-15Merge "Remove static from the listener."TreeHugger Robot
2017-02-14Remove static from the listener.Naveen Kalla
To support Multi-SIM and multi-IMS stack use cases, we should have multiple instances of ImsManager. And each instance may need a separate isntance of the Listener if it needs to invoke non-static methods or access any fields of the ImsManager. Test: Successful compilation with this change. Change-Id: Idf4de1232ea54fef03a9e4a7ce1d98b8df841291
2017-02-13Add an API to get recent IMS disconnect reasonsNaveen Kalla
ImsManager will store the last 16 disconnect reasons when onImsDisconnect callback is invoked. This information can be accessed by the clients of ImsManager using the new getRecentImsDisconnectReasons API Bug: 34694758 Test: Ensure that the new API returns IMS disconnect reasons in chronological order after running a few scenarios where IMS gets connected and disconnected. Change-Id: Iff5edeb9bba8898349ffce64f5975f5b1717cf76
2017-02-08Modify ImsVideoCallProvider to include calling UID for permission check. am: ↵Tyler Gunn
b984c78aba am: 07b6e48c68 am: c8ee152d36 am: 7da209df9b -s ours Change-Id: Id16b75b891bb432eb109f4c0d69c0c62cad5db50
2017-02-08Modify ImsVideoCallProvider to include calling UID for permission check. am: ↵Tyler Gunn
b984c78aba am: 07b6e48c68 am: c8ee152d36 Change-Id: Idf1d998074923d0cc87c168cf96a5d2fcfc4615d
2017-02-08Modify ImsVideoCallProvider to include calling UID for permission check. am: ↵Tyler Gunn
b984c78aba am: 07b6e48c68 Change-Id: I921309912041ba827f46362f8054a77df0bac7d4
2017-02-08Modify ImsVideoCallProvider to include calling UID for permission check.Tyler Gunn
am: b984c78aba Change-Id: I5d4f5d9d650ed69e2a55474d50d3691c6e8fb47f
2017-02-07Modify ImsVideoCallProvider to include calling UID for permission check.Tyler Gunn
Modify the ImsVideoCallProvider, which the vendor IMS stack implements to include the UID of telephony. The vendor IMS stack will use this when opening the camera for the purpose of camera permission verification by the camera service. Test: Unit, manual. Bug: 32747443 Merged-In: I0884cc08ea4afa23c08e3fe1e2873b3f5aac2b40 Change-Id: I0884cc08ea4afa23c08e3fe1e2873b3f5aac2b40
2016-12-22Merge "Update ImsRegistrationListener"Meng Wang
2016-12-22Use pause signaling to halt a video call when data limit is reached. am: ↵Tyler Gunn
266d3920dd am: 9139f28b30 Change-Id: I062f00a882dfca98bf409f5d87e5dee23ea90eae
2016-12-22Use pause signaling to halt a video call when data limit is reached.Tyler Gunn
am: 266d3920dd Change-Id: Ide11728466897c5b9dd55ba3837c04d9d8d8a27d
2016-12-22Adds testing framework to com.android.ims am: 3eb99bdaaa am: d4af2331b8 am: ↵Brad Ebinger
f2818debe7 am: 227163ef2e Change-Id: I7d3ed3bbf0dcf727143a9b532c75272823b5b03e
2016-12-22Adds testing framework to com.android.ims am: 3eb99bdaaa am: d4af2331b8Brad Ebinger
am: f2818debe7 Change-Id: I9c264ff259046f0b041eaad9619b13dd12402fc5
2016-12-22Adds testing framework to com.android.ims am: 3eb99bdaaaBrad Ebinger
am: d4af2331b8 Change-Id: Iaa53d8e6ec7bec927a8ef38a6438ae201cd41963
2016-12-22Adds testing framework to com.android.imsBrad Ebinger
am: 3eb99bdaaa Change-Id: I172b9a1ef447a5dde3104b867a102a59500bca17
2016-12-21Use pause signaling to halt a video call when data limit is reached.android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devTyler Gunn
This proved to be problematic as the InCallUI is the only place where we would previously get a pause signal. Added a VideoPauseTracker class which is responsible for tracking the source of pause requests and ensuring that the video is only paused on the first request, and only resumed on the last resume request. Added some new logic to ImsVideoCallProviderWrapper to support receiving pause and resume requests from other sources, and to ensure that requests to pause or resume use the VideoPauseTracker to determine if the pause or resume should actually be passed along to the modem. Test: manual Bug: 30760683 Change-Id: Id54b2a955745132ab09feb01b5c961f6115ef3df
2016-12-21Adds testing framework to com.android.imsandroid-n-mr2-preview-1Brad Ebinger
Test: Adding Change-Id: I8da86a5b9bc54cf56c95844d4845be38a61a9221
2016-12-14Update ImsRegistrationListenerMeng Wang
1. Replace onImsConnected() with onImsConnected(int) 2. Replace onImsProgressing() with onImsProgressing(int) 3. Add registrationChangeFailed() Bug: 33430556 Test: m Change-Id: I14c171494bdcb0d82ed4be0caff8cb52d35421cc
2016-12-10DO NOT MERGE ImsRegistrationListener#registrationChangeFailed am: e441415a33Meng Wang
am: 99e04765f2 -s ours Change-Id: Ib52d7ad1f86fedede7ec8c3e9e54e284b02c756c
2016-12-10DO NOT MERGE ImsRegistrationListener#registrationChangeFailedMeng Wang
am: e441415a33 Change-Id: Ia30672c87b79c486fc724eb58be25ec5048813a8
2016-12-08DO NOT MERGE ImsRegistrationListener#registrationChangeFailedMeng Wang
Bug: 33430556 Change-Id: Icea36e559f447b14c41a04cd517c12b632bc2c0c
2016-11-30Modify ImsVideoCallProvider to include calling UID for permission check.Tyler Gunn
Modify the ImsVideoCallProvider, which the vendor IMS stack implements to include the UID of telephony. The vendor IMS stack will use this when opening the camera for the purpose of camera permission verification by the camera service. Test: Unit, manual. Bug: 32747443 Change-Id: I0884cc08ea4afa23c08e3fe1e2873b3f5aac2b40
2016-11-23Merge "ImsManager: check roaming status in setWfcSetting" into nyc-mr2-dev ↵Meng Wang
am: e86c5833f2 am: 552cc3c237 Change-Id: I824dd15fe74e4bada26267c706a5913a4985e6c0
2016-11-23ImsManager: check roaming status in setWfcSetting am: 663aa12c70Meng Wang
am: ec69f5cfe8 Change-Id: I8cd387ff5a836f439ea59965432e1cb779db1468
2016-11-23Merge "ImsManager: check roaming status in setWfcSetting" into nyc-mr2-devMeng Wang
am: e86c5833f2 Change-Id: Icb86f7af6656ba2a213704141ca03aa3ec5734c6
2016-11-23ImsManager: check roaming status in setWfcSettingMeng Wang
am: 663aa12c70 Change-Id: Ibe58ff96e9a883cdb2bca5c289be7e546dd2ebe7
2016-11-23Merge "ImsManager: check roaming status in setWfcSetting" into nyc-mr2-devMeng Wang
2016-11-18Added configuration for VT downgrade/tear down when data disabled am: 5778185cdcJack Yu
am: f1945ddf51 -s ours Change-Id: Iaba1fdf33e952ef84f39b98e4b249f16a4aa41fa
2016-11-18Added configuration for VT downgrade/tear down when data disabledJack Yu
am: 5778185cdc Change-Id: Id27502754e2a0fdc72e955594809e6207fc4973b
2016-11-17Added configuration for VT downgrade/tear down when data disabledJack Yu
Added a new flag that allows carriers to ignore data disabled (e.g. data reaches limit or user disables data) so VT calls will not be downgraded/torn down and VT service will not be disabled. bug: 32880745 Merged-In: I8d3675e7df5972a05b35f1231f287c0dba8e9468 Change-Id: Iad786b542c3db0cd300cef27a41e492e6888b639
2016-11-17Added configuration for VT downgrade/tear down when data disabledJack Yu
Added a new flag that allows carriers to ignore data disabled (e.g. data reaches limit or user disables data) so VT calls will not be downgraded/torn down and VT service will not be disabled. Test: telephony unit tests bug: 32880745 Change-Id: I8d3675e7df5972a05b35f1231f287c0dba8e9468
2016-11-15ImsManager: check roaming status in setWfcSettingMeng Wang
In setWfcSetting(true), setWfcModeInternal(mode) is invoked. The mode to be passed should be determined by current roaming status. Bug: 32787997 Change-Id: I9e96de0a1db83adf50a8ba008a6b3741fe3c9b95
2016-10-06ImsManager: updateWfcFeatureAndProvisionedValues use roaming state am: ↵Meng Wang
531a8b68b4 am: 8f5ae40756 am: 6c7a14d290 Change-Id: Icdb5f782f94bf8b4070d20cc23bd3c7d939fdd59
2016-10-06ImsManager: updateWfcFeatureAndProvisionedValues use roaming state am: ↵Meng Wang
531a8b68b4 am: 8f5ae40756 Change-Id: Ibd951bf9faf0c94781c24ed35f5860da1aefb513
2016-10-06ImsManager: updateWfcFeatureAndProvisionedValues use roaming stateMeng Wang
am: 531a8b68b4 Change-Id: I70c0d9be607c271a1908aa1674a6ece5e9aa42d5
2016-10-06ImsManager: updateWfcFeatureAndProvisionedValues use roaming statenougat-mr1-devMeng Wang
In updateImsServiceConfig, WFC should be updated according to roaming state. Roaming-aware version of getWfcMode() should be used. Bug: 31972897 Change-Id: Ic4d6a516373d6ccdadad4fd43ed9e092d8ef72a6
2016-09-29ImsManager: add wfc roaming mode getter/setter am: 374770193c am: 21322cc58aMeng Wang
am: 82b37bf474 Change-Id: I5d153957b7120fe9fcc7f5c1a70904bc681c70e1
2016-09-29ImsManager: add wfc roaming mode getter/setter am: 374770193cMeng Wang
am: 21322cc58a Change-Id: I791c2600aba284cf2108371a66d526666c33349d
2016-09-29ImsManager: add wfc roaming mode getter/setterMeng Wang
am: 374770193c Change-Id: Iae2bd4818be93b0acf5819c8b844ab967a043ddd
2016-09-20ImsManager: add wfc roaming mode getter/setterMeng Wang
Bug: 31492826 Change-Id: Ia13c59bb1aba892759da2184bf570011ebe0876f
2016-08-24Fix potential error copying null conference participant list. am: 108a6b7283 ↵Tyler Gunn
am: ef3d89d01a am: ce8a6542dd Change-Id: Ic288a4c11b80b43ded2d1695b038a08aacbaf8d8
2016-08-24Fix potential error copying null conference participant list. am: 108a6b7283Tyler Gunn
am: ef3d89d01a Change-Id: I2a615eca5d499be15e40ac6b8370aab3bcec444b
2016-08-24Fix potential error copying null conference participant list.Tyler Gunn
am: 108a6b7283 Change-Id: I02c93d0706fb071fc053c654bac1df2ed1fd440c
2016-08-23Fix potential error copying null conference participant list.Tyler Gunn
In some cases, mConferenceParticipants can be null, causing the copy code to crash the com.android.phone app. Adding appropriate null/empty checks to prevent this. Bug: 31044679 Change-Id: I9ee464281af8213c03705d054500b8c5e2f12f05
2016-08-19Modify getConferenceParticipants() to return copy of the conference data. ↵Tyler Gunn
am: 3a3d8ebcc5 am: 119f590472 am: dc7432e575 Change-Id: I246bb792afa2c1ba3debd04338ba4f882c2254bc
2016-08-19Modify getConferenceParticipants() to return copy of the conference data. ↵Tyler Gunn
am: 3a3d8ebcc5 am: 119f590472 Change-Id: Ib968b3ec7929c75d1d1e0c3b9e52bccbafb02021
2016-08-19Modify getConferenceParticipants() to return copy of the conference data.Tyler Gunn
am: 3a3d8ebcc5 Change-Id: I90f7f4bd602444799ee6f53461ea5ea85bbfd7dc
2016-08-18Modify getConferenceParticipants() to return copy of the conference data.Tyler Gunn
In ImsConference#updateConferenceAfterCreation, getConferenceParticipants is called to get a copy of the CEP data. This, however, happens on a different thread than the update of that data. The ImsCall#getConferenceParticipants() method already synchronizes the return of the data on a lock which would prevent it from being updated while the "get" method is called, however, once the reference is returned there is no guarantee the underlying list won't be changed. Bug: 30861872 Change-Id: I27a1aa35299d36588c73bc47710e129e5e537a6a
2016-08-13Merge "Call setFeatureValue() even if turning off IMS." into nyc-mr1-dev am: ↵Amit Mahajan
385640ea76 am: 216a255970 am: 352311d71f Change-Id: Ibfe8a6b42c5f41f1e7bacabfe7725d0b7728c543
2016-08-13Call setFeatureValue() even if turning off IMS. am: 9cba36d1c6 am: 7047b2f121Amit Mahajan
am: fbafb4b797 Change-Id: Ic14f90787cd99cba301864b093682b43e591995b