diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-18 23:06:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-18 23:06:18 +0000 |
commit | 5f8c7c7637a7dcb2c1b7e54565191d7f357d0336 (patch) | |
tree | 002c5123f2d4d9c0def0391f90e8d625535bdcdb /java/com/android/incallui/videotech/duo/DuoVideoTech.java | |
parent | c332a5f54c2ea6459f66bd7bed33a5511e8609ac (diff) | |
parent | 6bd612f57bcd528283a4f45692908edf75574c60 (diff) |
Merge "Pass PhoneAccountHandle into VideoTech isAvailable"
Diffstat (limited to 'java/com/android/incallui/videotech/duo/DuoVideoTech.java')
-rw-r--r-- | java/com/android/incallui/videotech/duo/DuoVideoTech.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/com/android/incallui/videotech/duo/DuoVideoTech.java b/java/com/android/incallui/videotech/duo/DuoVideoTech.java index c858ae1f2..fdaed077b 100644 --- a/java/com/android/incallui/videotech/duo/DuoVideoTech.java +++ b/java/com/android/incallui/videotech/duo/DuoVideoTech.java @@ -20,6 +20,7 @@ import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.telecom.Call; +import android.telecom.PhoneAccountHandle; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.configprovider.ConfigProviderBindings; @@ -55,7 +56,7 @@ public class DuoVideoTech implements VideoTech, DuoListener { } @Override - public boolean isAvailable(Context context) { + public boolean isAvailable(Context context, PhoneAccountHandle phoneAccountHandle) { if (!ConfigProviderBindings.get(context) .getBoolean("enable_lightbringer_video_upgrade", true)) { LogUtil.v("DuoVideoTech.isAvailable", "upgrade disabled by flag"); @@ -66,7 +67,7 @@ public class DuoVideoTech implements VideoTech, DuoListener { LogUtil.v("DuoVideoTech.isAvailable", "upgrade unavailable, call must be active"); return false; } - Optional<Boolean> localResult = duo.supportsUpgrade(context, callingNumber); + Optional<Boolean> localResult = duo.supportsUpgrade(context, callingNumber, phoneAccountHandle); if (localResult.isPresent()) { LogUtil.v( "DuoVideoTech.isAvailable", "upgrade supported in local cache: " + localResult.get()); @@ -109,7 +110,8 @@ public class DuoVideoTech implements VideoTech, DuoListener { } @Override - public void onCallStateChanged(Context context, int newState) { + public void onCallStateChanged( + Context context, int newState, PhoneAccountHandle phoneAccountHandle) { if (newState == Call.STATE_DISCONNECTING) { duo.unregisterListener(this); } |