PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308

Browse Source 
Change-Id: Icd17e13882d838ca7629474d5abd29ac27c5c9d9
This commit is contained in:
Bonian Chen
2020-03-30 08:31:19 +00:00
committed by Automerger Merge Worker
parent 58baac0cbd fb7274a308
commit 89440ab287
3 changed files with 30 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/network/ims/VtQueryImsState.java
View File

@@ -27,9 +27,6 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.ims.ImsManager;
import com.android.settings.network.SubscriptionUtil;
/**
* Controller class for querying VT status
*/
@@ -65,12 +62,6 @@ public class VtQueryImsState extends ImsQueryController {
return (new ImsQueryVtUserSetting(subId)).query();
}
@VisibleForTesting
ImsManager getImsManager(int subId) {
return ImsManager.getInstance(mContext,
SubscriptionUtil.getPhoneId(mContext, subId));
}
/**
* Check whether Video Call can be perform or not on this subscription
*
@@ -81,19 +72,10 @@ public class VtQueryImsState extends ImsQueryController {
return false;
}
final ImsManager imsManager = getImsManager(mSubId);
if (imsManager == null) {
return false;
}
if (!imsManager.isVtEnabledByPlatform()) {
return false;
}
try {
return isServiceStateReady(mSubId);
return isEnabledByPlatform(mSubId) && isServiceStateReady(mSubId);
} catch (InterruptedException | IllegalArgumentException | ImsException exception) {
Log.w(LOG_TAG, "fail to get Vt service status. subId=" + mSubId, exception);
Log.w(LOG_TAG, "fail to get Vt ready. subId=" + mSubId, exception);
}
return false;
}