summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Brad Ebinger <breadley@google.com> 2019-03-20 13:53:13 -0700
committer android-build-merger <android-build-merger@google.com> 2019-03-20 13:53:13 -0700
commitd2b1925d5f52a4a7161c896377bbdb04792fa9c4 (patch)
tree05e263828591881f9a06895a2e791b9fc4fe0954
parent3be2db9bbf33f56efb92c97c0a91ad8ab670f0e0 (diff)
parent89a9462bfa131bf314745c597e4251e5d14e4976 (diff)
Merge "Make ImsException final" am: cdc0da732d am: ec6bf56d64
am: 89a9462bfa Change-Id: I71956dd999c8ec4be67bb6d58e1a1c3101e7c2b8
-rw-r--r--api/system-current.txt2
-rw-r--r--telephony/java/android/telephony/ims/ImsException.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 220a79c7d68f..0b50b0c60c8f 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8575,7 +8575,7 @@ package android.telephony.ims {
field public final java.util.HashMap<java.lang.String,android.os.Bundle> mParticipants;
}
- public class ImsException extends java.lang.Exception {
+ public final class ImsException extends java.lang.Exception {
ctor public ImsException(@Nullable String);
ctor public ImsException(@Nullable String, int);
ctor public ImsException(@Nullable String, int, @Nullable Throwable);
diff --git a/telephony/java/android/telephony/ims/ImsException.java b/telephony/java/android/telephony/ims/ImsException.java
index 02eddf67e25b..8c686f704967 100644
--- a/telephony/java/android/telephony/ims/ImsException.java
+++ b/telephony/java/android/telephony/ims/ImsException.java
@@ -31,7 +31,7 @@ import java.lang.annotation.RetentionPolicy;
* @hide
*/
@SystemApi
-public class ImsException extends Exception {
+public final class ImsException extends Exception {
/**
* The operation has failed due to an unknown or unspecified error.