Merge "Try closing PFDs sent in map after binder call" into main (fcafa1c9) · Commits · e / os / android_frameworks_base

core/java/android/service/ondeviceintelligence/OnDeviceIntelligenceService.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ import com.android.internal.infra.AndroidFuture;

		import java.io.File;
		import java.io.FileNotFoundException;
		import java.util.Collection;
		import java.util.List;
		import java.util.Map;
		import java.util.Objects;
		@@ -224,6 +225,7 @@ public abstract class OnDeviceIntelligenceService extends Service {
		Bundle bundle = new Bundle();
		parcelFileDescriptorMap.forEach(bundle::putParcelable);
		remoteCallback.sendResult(bundle);
		tryClosePfds(parcelFileDescriptorMap.values());
		}));
		}

		@@ -444,6 +446,16 @@ public abstract class OnDeviceIntelligenceService extends Service {
		};
		}

		private static void tryClosePfds(Collection<ParcelFileDescriptor> pfds) {
		pfds.forEach(pfd -> {
		try {
		pfd.close();
		} catch (Exception e) {
		Log.w(TAG, "Error closing FD", e);
		}
		});
		}

		private void onGetReadOnlyFileDescriptor(@NonNull String fileName,
		@NonNull AndroidFuture<ParcelFileDescriptor> future) {
		Slog.v(TAG, "onGetReadOnlyFileDescriptor " + fileName);