Merge "Improved `dumpsys device_config` so it calls the mainline implementation." into main (350d40e9) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ android_library {
		"aconfig_new_storage_flags_lib",
		"aconfigd_java_utils",
		"aconfig_demo_flags_java_lib",
		"configinfra_framework_flags_java_lib",
		"device_config_service_flags_java",
		"libaconfig_java_proto_lite",
		"SettingsLibDeviceStateRotationLock",

+16 −6

Original line number	Diff line number	Diff line
		@@ -99,13 +99,23 @@ public final class DeviceConfigService extends Binder {

		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		if (android.provider.flags.Flags.dumpImprovements()) {
		pw.print("SyncDisabledForTests: ");
		MyShellCommand.getSyncDisabledForTests(pw, pw);

		pw.print("Is mainline: ");
		pw.print("UpdatableDeviceConfigServiceReadiness.shouldStartUpdatableService(): ");
		pw.println(UpdatableDeviceConfigServiceReadiness.shouldStartUpdatableService());

		final IContentProvider iprovider = mProvider.getIContentProvider();
		pw.println("DeviceConfig provider: ");
		try (ParcelFileDescriptor pfd = ParcelFileDescriptor.dup(fd)) {
		DeviceConfig.dump(pfd, pw, /* prefix= */ " ", args);
		} catch (IOException e) {
		pw.print("IOException creating ParcelFileDescriptor: ");
		pw.println(e);
		}
		}

		IContentProvider iprovider = mProvider.getIContentProvider();
		pw.println("DeviceConfig flags:");
		for (String line : MyShellCommand.listAll(iprovider)) {
		pw.println(line);