summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerfanian <erfanian@google.com>2018-04-04 18:03:49 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-04-04 18:03:49 -0700
commita0fc98b466fb3ebd662dcf092162c8778c0c119c (patch)
tree1abe38770d74733c25e252104a02608809e14481
parent49c91b2d6c64cd9c30e52cded91fe2122e7cdde8 (diff)
parent7f1a323d15c6baac247bce44636ceb185df14bc0 (diff)
Merge "Remove null check." am: 05945e8a79
am: 7f1a323d15 Change-Id: Idc77cfce96d3dcd7cf0208647ace17d95aa0b172
-rw-r--r--java/com/android/incallui/InCallActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index 44d8667ca..fadc40686 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -1391,7 +1391,7 @@ public class InCallActivity extends TransactionSafeFragmentActivity
}
public void setSpeakEasyCallManager(SpeakEasyCallManager speakEasyCallManager) {
- this.speakEasyCallManager = Assert.isNotNull(speakEasyCallManager);
+ this.speakEasyCallManager = speakEasyCallManager;
}
public SpeakEasyCallManager getSpeakEasyCallManager() {