diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-07-15 15:44:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 15:44:46 -0700 |
| commit | 3e5e21d4dc74751e64d17379c5563ece39a7e35d (patch) | |
| tree | b59e54a9528bf1844521574339231468d726be6c /core/java/android/database/DatabaseUtils.java | |
| parent | cc52121c4f88e9feb8404937bcbfff6e73084666 (diff) | |
| parent | 1772c34e5331a6456c8a93051192d19ff873c062 (diff) | |
am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread
Merge commit '1772c34e5331a6456c8a93051192d19ff873c062' into gingerbread-plus-aosp
* commit '1772c34e5331a6456c8a93051192d19ff873c062':
StrictMode: gather and return violating stacks in Binder replies
Diffstat (limited to 'core/java/android/database/DatabaseUtils.java')
| -rw-r--r-- | core/java/android/database/DatabaseUtils.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/database/DatabaseUtils.java b/core/java/android/database/DatabaseUtils.java index 9bfbb74eeb27..66406cac439a 100644 --- a/core/java/android/database/DatabaseUtils.java +++ b/core/java/android/database/DatabaseUtils.java @@ -108,7 +108,7 @@ public class DatabaseUtils { * @see Parcel#readException */ public static final void readExceptionFromParcel(Parcel reply) { - int code = reply.readInt(); + int code = reply.readExceptionCode(); if (code == 0) return; String msg = reply.readString(); DatabaseUtils.readExceptionFromParcel(reply, msg, code); @@ -116,7 +116,7 @@ public class DatabaseUtils { public static void readExceptionWithFileNotFoundExceptionFromParcel( Parcel reply) throws FileNotFoundException { - int code = reply.readInt(); + int code = reply.readExceptionCode(); if (code == 0) return; String msg = reply.readString(); if (code == 1) { @@ -128,7 +128,7 @@ public class DatabaseUtils { public static void readExceptionWithOperationApplicationExceptionFromParcel( Parcel reply) throws OperationApplicationException { - int code = reply.readInt(); + int code = reply.readExceptionCode(); if (code == 0) return; String msg = reply.readString(); if (code == 10) { |