Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01f01dae authored by Jordan Liu's avatar Jordan Liu Committed by Automerger Merge Worker
Browse files

Merge "Call CBS dump in dumpsys" into mainline-prod am: 2d723618 am: c5b3080f am: 5b954ad5

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

Change-Id: Ib1d3d6cd01bb3944ccd17003239397d8bd61703d
parents 039a8f3a 5b954ad5
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -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);
        }
    }
}