diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-29 14:10:12 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-29 14:10:12 -0700 |
commit | afa7d85b43c6c2058cbde61ff287ff5776d76d2a (patch) | |
tree | 2d57b589a728a3f836aa2f0bc70fa124f3a75861 /core/java/android/backup/BackupDataInput.java | |
parent | 1c3f760dcd4a4934e5197a23b76b296310f2259a (diff) | |
parent | 9bb8fd77c8dc177aab9ac96bed4f55972dcda70a (diff) | |
download | frameworks_base-afa7d85b43c6c2058cbde61ff287ff5776d76d2a.zip frameworks_base-afa7d85b43c6c2058cbde61ff287ff5776d76d2a.tar.gz frameworks_base-afa7d85b43c6c2058cbde61ff287ff5776d76d2a.tar.bz2 |
Merge change 9008
* changes:
Only restore the bits for wallpapers that aren't built in.
Diffstat (limited to 'core/java/android/backup/BackupDataInput.java')
-rw-r--r-- | core/java/android/backup/BackupDataInput.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/core/java/android/backup/BackupDataInput.java b/core/java/android/backup/BackupDataInput.java index 69c206c..e67b0be 100644 --- a/core/java/android/backup/BackupDataInput.java +++ b/core/java/android/backup/BackupDataInput.java @@ -97,12 +97,7 @@ public class BackupDataInput { public void skipEntityData() throws IOException { if (mHeaderReady) { - int result = skipEntityData_native(mBackupReader); - if (result >= 0) { - return; - } else { - throw new IOException("result=0x" + Integer.toHexString(result)); - } + skipEntityData_native(mBackupReader); } else { throw new IllegalStateException("mHeaderReady=false"); } |