Merge "Clear binder identity while dumping pre-reboot logs"

import android.annotation.DurationMillisLong;

import android.annotation.NonNull;

import android.content.Context;

import android.os.Binder;

import android.os.Environment;

import android.os.IBinder;

import android.os.ParcelFileDescriptor;

            return;

        }

        final long token = Binder.clearCallingIdentity();

        try {

            final File dumpFile = new File(dumpDir, serviceName);

            final ParcelFileDescriptor fd = ParcelFileDescriptor.open(dumpFile,

            binder.dump(fd.getFileDescriptor(), ArrayUtils.emptyArray(String.class));

        } catch (FileNotFoundException | RemoteException e) {

            Slog.e(TAG, String.format("Failed to dump %s service before reboot", serviceName), e);

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }

}