]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android/platform-hardware-interfaces.git/commitdiff
Merge "Add None into cancelPendingUssd" into oreo-vts-dev
authorsqian <shuoq@google.com>
Thu, 25 Jan 2018 02:40:26 +0000 (02:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 02:40:26 +0000 (02:40 +0000)
am: 4ccc3b0140

Change-Id: Iad35b1764095d6b4bdd52dfd8f8e6a73940bfab5

1  2 
radio/1.0/vts/functional/radio_hidl_hal_voice.cpp

index 1d2f199de0d7ecb01baa9cf7aa5a82e8d3058add,01141f845c87997a1a14a321bcf6de0cbaf6a941..e1d901050e8841fbe34562bbea11a3ae485999ca
@@@ -488,6 -487,6 +488,6 @@@ TEST_F(RadioHidlTest, sendBurstDtmf) 
                      radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
                      radioRsp->rspInfo.error == RadioError::INVALID_STATE ||
                      radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
 -                    radioRsp->rspInfo.error == RadioError::MODE_NOT_SUPPORTED);
 +                    radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED);
      }
- }
+ }