Merge "Bluetooth: Pre-pend empty line for dumpsys section headers" (be4e25c2) · Commits · e / os / android_packages_modules_Bluetooth

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+6 −11

Original line number	Original line	Diff line number	Diff line
	@@ -2150,31 +2150,26 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
	(int)((onDuration / (1000 * 60)) % 60),		(int)((onDuration / (1000 * 60)) % 60),
	(int)((onDuration / 1000) % 60),		(int)((onDuration / 1000) % 60),
	(int)(onDuration % 1000));		(int)(onDuration % 1000));
	writer.println(" time since enabled: " + onDurationString + "\n");		writer.println(" time since enabled: " + onDurationString);
	}		}

	if (mActiveLogs.size() == 0) {		if (mActiveLogs.size() == 0) {
	writer.println("Bluetooth never enabled!");		writer.println("\nBluetooth never enabled!");
	} else {		} else {
	writer.println("Enable log:");		writer.println("\nEnable log:");
	for (ActiveLog log : mActiveLogs) {		for (ActiveLog log : mActiveLogs) {
	writer.println(" " + log);		writer.println(" " + log);
	}		}
	}		}

	writer.println("Bluetooth crashed " + mCrashes + " time" + (mCrashes == 1 ? "" : "s"));		writer.println("\nBluetooth crashed " + mCrashes + " time" + (mCrashes == 1 ? "" : "s"));
	if (mCrashes == CRASH_LOG_MAX_SIZE) writer.println("(last " + CRASH_LOG_MAX_SIZE + ")");		if (mCrashes == CRASH_LOG_MAX_SIZE) writer.println("(last " + CRASH_LOG_MAX_SIZE + ")");
	for (Long time : mCrashTimestamps) {		for (Long time : mCrashTimestamps) {
	writer.println(" " + timeToLog(time.longValue()));		writer.println(" " + timeToLog(time.longValue()));
	}		}

	String bleAppString = "No BLE Apps registered.";		writer.println("\n" + mBleApps.size() + " BLE app" +
	if (mBleApps.size() == 1) {		(mBleApps.size() == 1 ? "" : "s") + "registered");
	bleAppString = "1 BLE App registered:";
	} else if (mBleApps.size() > 1) {
	bleAppString = mBleApps.size() + " BLE Apps registered:";
	}
	writer.println("\n" + bleAppString);
	for (ClientDeathRecipient app : mBleApps.values()) {		for (ClientDeathRecipient app : mBleApps.values()) {
	writer.println(" " + app.getPackageName());		writer.println(" " + app.getPackageName());
	}		}