diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-24 22:41:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-24 22:41:00 +0000 |
commit | daa1c44c00f3c598223639c9b80a52cf41db51ba (patch) | |
tree | e4c88a1862b157dc858abe73e52b077bf7b96948 /java/com/android/incallui/call | |
parent | ef7338cf787301c573fde8129bf8880d7faba040 (diff) | |
parent | 938468da6f5c225ebb161a68bd949c9cf3261892 (diff) |
Merge "Rename the new bubble package name from "bubble" to "newbubble"."
Diffstat (limited to 'java/com/android/incallui/call')
-rw-r--r-- | java/com/android/incallui/call/CallList.java | 4 | ||||
-rw-r--r-- | java/com/android/incallui/call/DialerCall.java | 22 |
2 files changed, 16 insertions, 10 deletions
diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java index fcfb0a663..59f38349a 100644 --- a/java/com/android/incallui/call/CallList.java +++ b/java/com/android/incallui/call/CallList.java @@ -298,7 +298,7 @@ public class CallList implements DialerCallDelegate { manager.unregisterStateChangedListener(call); // Don't log an already logged call. logCall() might be called multiple times - // for the same call due to b/24109437. + // for the same call due to a bug. if (call.getLogState() != null && !call.getLogState().isLogged) { getLegacyBindings(context).logCall(call); call.getLogState().isLogged = true; @@ -344,7 +344,7 @@ public class CallList implements DialerCallDelegate { DialerCall call = mCallByTelecomCall.get(telecomCall); // Don't log an already logged call. logCall() might be called multiple times - // for the same call due to b/24109437. + // for the same call due to a bug. if (call.getLogState() != null && !call.getLogState().isLogged) { getLegacyBindings(context).logCall(call); call.getLogState().isLogged = true; diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java index d911a4c4f..e8523d650 100644 --- a/java/com/android/incallui/call/DialerCall.java +++ b/java/com/android/incallui/call/DialerCall.java @@ -94,7 +94,7 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa public static final int CALL_HISTORY_STATUS_NOT_PRESENT = 2; // Hard coded property for {@code Call}. Upstreamed change from Motorola. - // TODO(b/35359461): Move it to Telecom in framework. + // TODO(a bug): Move it to Telecom in framework. public static final int PROPERTY_CODEC_KNOWN = 0x04000000; private static final String ID_PREFIX = "DialerCall_"; @@ -143,9 +143,12 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa @CallHistoryStatus private int mCallHistoryStatus = CALL_HISTORY_STATUS_UNKNOWN; private boolean mIsSpam; private boolean mIsBlocked; - private boolean isInUserSpamList; - private boolean isInUserWhiteList; - private boolean isInGlobalSpamList; + + @Nullable private Boolean isInUserSpamList; + + @Nullable private Boolean isInUserWhiteList; + + @Nullable private Boolean isInGlobalSpamList; private boolean didShowCameraPermission; private String callProviderLabel; private String callbackNumber; @@ -575,7 +578,7 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa */ protected boolean areCallExtrasCorrupted(Bundle callExtras) { /** - * There's currently a bug in Telephony service (b/25613098) that could corrupt the extras + * There's currently a bug in Telephony service (a bug) that could corrupt the extras * bundle, resulting in a IllegalArgumentException while validating data under {@link * Bundle#containsKey(String)}. */ @@ -1015,7 +1018,8 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa didShowCameraPermission = didShow; } - public boolean isInGlobalSpamList() { + @Nullable + public Boolean isInGlobalSpamList() { return isInGlobalSpamList; } @@ -1023,7 +1027,8 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa isInGlobalSpamList = inSpamList; } - public boolean isInUserSpamList() { + @Nullable + public Boolean isInUserSpamList() { return isInUserSpamList; } @@ -1031,7 +1036,8 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa isInUserSpamList = inSpamList; } - public boolean isInUserWhiteList() { + @Nullable + public Boolean isInUserWhiteList() { return isInUserWhiteList; } |