diff options
author | Cole Faust <colefaust@google.com> | 2022-10-25 19:23:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-25 19:23:29 +0000 |
commit | 94d4e62f2955481792557d7379416e4985b4aacc (patch) | |
tree | 707e21879669fa043e92d03c30b6c1950560bc10 | |
parent | 4694b3ee9116d0c41e552787f6f81c462c04c76d (diff) | |
parent | dcc6d81c40310bd07b911c3506d7ae096b2cb42d (diff) | |
download | ims-94d4e62f2955481792557d7379416e4985b4aacc.tar.gz |
Fix errorprone warnings that should be errors am: dcc6d81c40
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2255374
Change-Id: I240e573b3a36fe7c0b026bb24f63bf4f3d6bb15a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
8 files changed, 9 insertions, 14 deletions
diff --git a/rcs/presencepolling/src/com/android/service/ims/presence/AlarmBroadcastReceiver.java b/rcs/presencepolling/src/com/android/service/ims/presence/AlarmBroadcastReceiver.java index 2ce4da9..7cddb30 100644 --- a/rcs/presencepolling/src/com/android/service/ims/presence/AlarmBroadcastReceiver.java +++ b/rcs/presencepolling/src/com/android/service/ims/presence/AlarmBroadcastReceiver.java @@ -75,5 +75,5 @@ public class AlarmBroadcastReceiver extends BroadcastReceiver { logger.debug("No interest in this intent: " + action); } } -}; +} diff --git a/rcs/rcsservice/src/com/android/service/ims/AlarmBroadcastReceiver.java b/rcs/rcsservice/src/com/android/service/ims/AlarmBroadcastReceiver.java index e06b4a4..9c06a5e 100644 --- a/rcs/rcsservice/src/com/android/service/ims/AlarmBroadcastReceiver.java +++ b/rcs/rcsservice/src/com/android/service/ims/AlarmBroadcastReceiver.java @@ -68,5 +68,4 @@ public class AlarmBroadcastReceiver extends BroadcastReceiver{ logger.debug("not interest in intent=" + intent); } } -}; - +} diff --git a/rcs/rcsservice/src/com/android/service/ims/StackListener.java b/rcs/rcsservice/src/com/android/service/ims/StackListener.java index 649a66b..a89f459 100644 --- a/rcs/rcsservice/src/com/android/service/ims/StackListener.java +++ b/rcs/rcsservice/src/com/android/service/ims/StackListener.java @@ -508,8 +508,8 @@ public class StackListener extends Handler{ public void capInfoReceived(String presentityURI, PresTupleInfo[] pTupleInfo) throws RemoteException { logger.debug("ListenerHandler : CapInfoReceived"); - if(presentityURI == null || presentityURI == null){ - logger.error("presentityURI=null or presentityURI=null"); + if(presentityURI == null) { + logger.error("presentityURI=null"); return; } diff --git a/rcs/rcsservice/src/com/android/service/ims/Task.java b/rcs/rcsservice/src/com/android/service/ims/Task.java index 61e85b4..ce4ef34 100644 --- a/rcs/rcsservice/src/com/android/service/ims/Task.java +++ b/rcs/rcsservice/src/com/android/service/ims/Task.java @@ -78,5 +78,4 @@ public class Task{ " mSipResponseCode=" + mSipResponseCode + " mSipReasonPhrase=" + mSipReasonPhrase; } -}; - +} diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceAvailabilityTask.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceAvailabilityTask.java index 08a5b32..6f53fa6 100644 --- a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceAvailabilityTask.java +++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceAvailabilityTask.java @@ -69,5 +69,4 @@ public class PresenceAvailabilityTask extends PresenceTask{ return super.toString() + " mNotifyTimeStamp=" + mNotifyTimeStamp; } -}; - +} diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceCapabilityTask.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceCapabilityTask.java index fb22b5e..f93b317 100644 --- a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceCapabilityTask.java +++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceCapabilityTask.java @@ -161,4 +161,4 @@ public class PresenceCapabilityTask extends PresenceTask{ TaskManager.getDefault().removeTask(mTaskId); } -}; +} diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublishTask.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublishTask.java index 24d1ada..49bd1e2 100644 --- a/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublishTask.java +++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublishTask.java @@ -61,5 +61,4 @@ public class PresencePublishTask extends PresenceTask{ " mCreateTimestamp=" + mCreateTimestamp + " mRetryCount=" + mRetryCount; } -}; - +} diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceTask.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceTask.java index 5465e10..1f24507 100644 --- a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceTask.java +++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceTask.java @@ -55,5 +55,4 @@ public class PresenceTask extends Task { " mSipResponseCode=" + mSipResponseCode + " mSipReasonPhrase=" + mSipReasonPhrase; } -}; - +} |