Merge "Call CBS dump in dumpsys" into mainline-prod am: 2d723618c6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14607393

Change-Id: Ie203aa0f62dac0b2d15f3e10ffca6b19e845984d

1 files changed, 16 insertions, 0 deletions

diff --git a/telephony/java/android/telephony/CellBroadcastService.java b/telephony/java/android/telephony/CellBroadcastService.java
index ac775b391e94..14de2f285756 100644
--- a/telephony/java/android/telephony/CellBroadcastService.java
+++ b/telephony/java/android/telephony/CellBroadcastService.java
@@ -28,6 +28,11 @@ import android.os.IBinder;
 import android.os.RemoteCallback;
 import android.telephony.cdma.CdmaSmsCbProgramData;
 
+import com.android.internal.util.FastPrintWriter;
+
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
+import java.io.PrintWriter;
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -186,5 +191,16 @@ public abstract class CellBroadcastService extends Service {
         public @NonNull CharSequence getCellBroadcastAreaInfo(int slotIndex) {
             return CellBroadcastService.this.getCellBroadcastAreaInfo(slotIndex);
         }
+
+        @Override
+        protected void dump(FileDescriptor fd, PrintWriter fout, String[] args) {
+            CellBroadcastService.this.dump(fd, fout, args);
+        }
+
+        @Override
+        public void dump(FileDescriptor fd, String[] args) {
+            PrintWriter pw = new FastPrintWriter(new FileOutputStream(fd));
+            CellBroadcastService.this.dump(fd, pw, args);
+        }
     }
 }