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

am 439a63b3: Fix nine patch crash

Browse Source 
* commit '439a63b3a9d958e1b53db64686a4dd3199786323':
  Fix nine patch crash
This commit is contained in:
Chris Craik
2014-08-06 16:48:24 +00:00
committed by Android Git Automerger
parent ad0a752382 01af516a87
commit 2e294a9798
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/java/android/graphics/NinePatch.java
View File

@@ -118,7 +118,10 @@ public class NinePatch {
@Override
protected void finalize() throws Throwable {
try {
nativeFinalize(mNativeChunk);
if (mNativeChunk != 0) {
// only attempt to destroy correctly initilized chunks
nativeFinalize(mNativeChunk);
}
} finally {
super.finalize();
}

4
graphics/java/android/graphics/drawable/NinePatchDrawable.java
View File

@@ -613,10 +613,10 @@ public class NinePatchDrawable extends Drawable {
this(ninePatch, padding, opticalInsets, DEFAULT_DITHER, false);
}
NinePatchState(NinePatch ninePatch, Rect rect, Rect opticalInsets, boolean dither,
NinePatchState(NinePatch ninePatch, Rect padding, Rect opticalInsets, boolean dither,
boolean autoMirror) {
mNinePatch = ninePatch;
mPadding = rect;
mPadding = padding;
mOpticalInsets = Insets.of(opticalInsets);
mDither = dither;
mAutoMirrored = autoMirror;