Merge "Fix indentation for dumpsys" (57503957) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/LocationManagerService.java

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3309,18 +3309,24 @@ public class LocationManagerService extends ILocationManager.Stub {
	ipw.decreaseIndent();		ipw.decreaseIndent();
	}		}

	mSettingsStore.dump(fd, pw, args);		ipw.println("Location Settings:");
			ipw.increaseIndent();
			mSettingsStore.dump(fd, ipw, args);
			ipw.decreaseIndent();

	ipw.println("Location Providers:");		ipw.println("Location Providers:");
	ipw.increaseIndent();		ipw.increaseIndent();
	for (LocationProvider provider : mProviders) {		for (LocationProvider provider : mProviders) {
	provider.dumpLocked(fd, ipw, args);		provider.dumpLocked(fd, ipw, args);
	}		}
			ipw.decreaseIndent();
	}		}

	if (mGnssManagerService != null) {		if (mGnssManagerService != null) {
			ipw.println("GNSS:");
			ipw.increaseIndent();
			mGnssManagerService.dump(fd, ipw, args);
	ipw.decreaseIndent();		ipw.decreaseIndent();
	mGnssManagerService.dump(fd, pw, args);
	}		}
	}		}
	}		}

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -237,9 +237,6 @@ public class LocationSettingsStore {
	IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " ");		IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " ");
	int userId = ActivityManager.getCurrentUser();		int userId = ActivityManager.getCurrentUser();

	ipw.println("--Location Settings--");
	ipw.increaseIndent();

	ipw.print("Location Enabled: ");		ipw.print("Location Enabled: ");
	ipw.println(isLocationEnabled(userId));		ipw.println(isLocationEnabled(userId));