Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3e5e21d4: am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread

Browse Source 
Merge commit '3e5e21d4dc74751e64d17379c5563ece39a7e35d'

* commit '3e5e21d4dc74751e64d17379c5563ece39a7e35d':
  StrictMode: gather and return violating stacks in Binder replies
This commit is contained in:
Brad Fitzpatrick
2010-07-15 23:05:39 -07:00
committed by Android Git Automerger
parent 9555a1323e 3e5e21d4dc
commit d2f6c7fe73
6 changed files with 289 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/database/DatabaseUtils.java
View File

@@ -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) {