Merge "Expose system apis for backup transport migration" into lmp-dev (4220a9a9) · Commits · e / os / android_frameworks_base

core/java/android/app/backup/BackupDataInput.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.app.backup;

		import android.annotation.SystemApi;

		import java.io.FileDescriptor;
		import java.io.IOException;

		@@ -70,6 +72,7 @@ public class BackupDataInput {
		}

		/** @hide */
		@SystemApi
		public BackupDataInput(FileDescriptor fd) {
		if (fd == null) throw new NullPointerException();
		mBackupReader = ctor(fd);
		@@ -79,6 +82,7 @@ public class BackupDataInput {
		}

		/** @hide */
		@Override
		protected void finalize() throws Throwable {
		try {
		dtor(mBackupReader);

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.app.backup;

		import android.annotation.SystemApi;
		import android.os.ParcelFileDescriptor;
		import android.os.Process;

		@@ -66,6 +67,7 @@ public class BackupDataOutput {
		long mBackupWriter;

		/** @hide */
		@SystemApi
		public BackupDataOutput(FileDescriptor fd) {
		if (fd == null) throw new NullPointerException();
		mBackupWriter = ctor(fd);
		@@ -115,6 +117,7 @@ public class BackupDataOutput {
		}

		/** @hide */
		@Override
		protected void finalize() throws Throwable {
		try {
		dtor(mBackupWriter);

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ public class BackupTransport {
		public static final int AGENT_UNKNOWN = -1004;

		IBackupTransport mBinderImpl = new TransportImpl();
		/** @hide */

		public IBinder getBinder() {
		return mBinderImpl.asBinder();
		}