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

am fc9122ec: Merge "Implement #10666712: NetworkOnMainThreadException should be..." into klp-dev

Browse Source 
* commit 'fc9122ecae06339283602bdc78c5d704d95e3f29':
  Implement #10666712: NetworkOnMainThreadException should be...
This commit is contained in:
Dianne Hackborn
2013-09-13 18:06:59 -07:00
committed by Android Git Automerger
parent 691a3191e3 fc9122ecae
commit 570d0ca39c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/os/Parcel.java
View File

@@ -228,6 +228,7 @@ public final class Parcel {
private static final int EX_ILLEGAL_ARGUMENT = -3;
private static final int EX_NULL_POINTER = -4;
private static final int EX_ILLEGAL_STATE = -5;
private static final int EX_NETWORK_MAIN_THREAD = -6;
private static final int EX_HAS_REPLY_HEADER = -128; // special; see below
private static native int nativeDataSize(int nativePtr);
@@ -1321,6 +1322,7 @@ public final class Parcel {
* <li>{@link IllegalStateException}
* <li>{@link NullPointerException}
* <li>{@link SecurityException}
* <li>{@link NetworkOnMainThreadException}
* </ul>
*
* @param e The Exception to be written.
@@ -1340,6 +1342,8 @@ public final class Parcel {
code = EX_NULL_POINTER;
} else if (e instanceof IllegalStateException) {
code = EX_ILLEGAL_STATE;
} else if (e instanceof NetworkOnMainThreadException) {
code = EX_NETWORK_MAIN_THREAD;
}
writeInt(code);
StrictMode.clearGatheredViolations();
@@ -1455,6 +1459,8 @@ public final class Parcel {
throw new NullPointerException(msg);
case EX_ILLEGAL_STATE:
throw new IllegalStateException(msg);
case EX_NETWORK_MAIN_THREAD:
throw new NetworkOnMainThreadException();
}
throw new RuntimeException("Unknown exception code: " + code
+ " msg " + msg);