Merge "Don't print dumpsys info twice in bugreport" (d65bac68) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2556,6 +2556,12 @@ public class AdapterService extends Service {
	protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) {		protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
	enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);		enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);

			if (args.length == 0) {
			writer.println("Skipping dump in APP SERVICES, see bluetooth_manager section.");
			writer.println("Use --print argument for dumpsys direct from AdapterService.");
			return;
			}

	if (args.length > 0) {		if (args.length > 0) {
	verboseLog("dumpsys arguments, check for protobuf output: "		verboseLog("dumpsys arguments, check for protobuf output: "
	+ TextUtils.join(" ", args));		+ TextUtils.join(" ", args));