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

Merge "Change ISE to AssertException, which is more suitable." into qt-dev

Browse Source 
am: 5e7b4175b7

Change-Id: Icbee6bef0924b2abcafa7834b739290b2360d10e
This commit is contained in:
Makoto Onuki
2019-04-04 17:35:30 -07:00
committed by android-build-merger
parent 183edc9565 5e7b4175b7
commit 79f6fbe6f6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/database/CursorWindow.java
View File

@@ -138,7 +138,7 @@ public class CursorWindow extends SQLiteClosable implements Parcelable {
mName = name != null && name.length() != 0 ? name : "<unnamed>";
mWindowPtr = nativeCreate(mName, (int) windowSizeBytes);
if (mWindowPtr == 0) {
throw new IllegalStateException(); // Shouldn't happen.
throw new AssertionError(); // Not possible, the native code won't return it.
}
mCloseGuard.open("close");
recordNewWindow(Binder.getCallingPid(), mWindowPtr);
@@ -166,7 +166,7 @@ public class CursorWindow extends SQLiteClosable implements Parcelable {
mStartPos = source.readInt();
mWindowPtr = nativeCreateFromParcel(source);
if (mWindowPtr == 0) {
throw new IllegalStateException(); // Shouldn't happen.
throw new AssertionError(); // Not possible, the native code won't return it.
}
mName = nativeGetName(mWindowPtr);
mCloseGuard.open("close");