summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kutik <daniel.kutik@lavawerk.com>2020-05-04 14:05:23 +0800
committerSemavi Ulusoy <doc.divxm@gmail.com>2022-09-13 10:46:27 +0300
commit30f59165c67b77170e0519e26183d01bfbc70f60 (patch)
tree9597341bb7a73a0c083d0c63a61a27c09206c17a
parentc4afccfc4371aff206a03a91327335f06bcac0d4 (diff)
Fix NPE in InCallPresenter
Handling case where call.getHandle() returns null in InCallPresenter#setDisconnectCauseForMissingAccounts Test: reran monkeyrunner Issue: 155582943 Signed-off-by: Daniel Kutik <daniel.kutik@lavawerk.com> Change-Id: I2caaf9fc063a5673b369f196ceaf4ca589316bc7 Signed-off-by: blinoff82 <blinov.in@gmail.com>
-rw-r--r--java/com/android/incallui/InCallPresenter.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java
index ab749ed8e..ff9e0b400 100644
--- a/java/com/android/incallui/InCallPresenter.java
+++ b/java/com/android/incallui/InCallPresenter.java
@@ -20,6 +20,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Point;
+import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.Trace;
@@ -1637,7 +1638,8 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud
extras.getParcelableArrayList(android.telecom.Call.AVAILABLE_PHONE_ACCOUNTS);
if (phoneAccountHandles == null || phoneAccountHandles.isEmpty()) {
- String scheme = call.getHandle().getScheme();
+ Uri callHandle = call.getHandle();
+ String scheme = callHandle == null ? "null" : callHandle.getScheme();
final String errorMsg =
PhoneAccount.SCHEME_TEL.equals(scheme)
? context.getString(R.string.callFailed_simError)