From ff31addb9b767496ba5c907513be172779eadfc5 Mon Sep 17 00:00:00 2001 From: arete Date: Mon, 18 Aug 2014 11:50:51 -0700 Subject: Expose system apis for backup transport migration Bug: 16542048 Change-Id: I45e710028316e7b2dc4195700a1e7344afb54691 --- core/java/android/app/backup/BackupDataInput.java | 6 +++++- core/java/android/app/backup/BackupDataOutput.java | 3 +++ core/java/android/app/backup/BackupTransport.java | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/backup/BackupDataInput.java b/core/java/android/app/backup/BackupDataInput.java index 03205fb..26f9e3e 100644 --- a/core/java/android/app/backup/BackupDataInput.java +++ b/core/java/android/app/backup/BackupDataInput.java @@ -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); @@ -174,7 +178,7 @@ public class BackupDataInput { * for further processing. This allows a {@link android.app.backup.BackupAgent} to * efficiently discard obsolete or otherwise uninteresting records during the * restore operation. - * + * * @throws IOException if an error occurred when trying to read the restore data stream */ public void skipEntityData() throws IOException { diff --git a/core/java/android/app/backup/BackupDataOutput.java b/core/java/android/app/backup/BackupDataOutput.java index fc5fb3d..048a4bb 100644 --- a/core/java/android/app/backup/BackupDataOutput.java +++ b/core/java/android/app/backup/BackupDataOutput.java @@ -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); diff --git a/core/java/android/app/backup/BackupTransport.java b/core/java/android/app/backup/BackupTransport.java index 6cfabf0..70bb5e4 100644 --- a/core/java/android/app/backup/BackupTransport.java +++ b/core/java/android/app/backup/BackupTransport.java @@ -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(); } -- cgit v1.1