Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abd917d1 authored by John Reck's avatar John Reck
Browse files

Workaround for custom TypedArray injectors 

Fixes: 33814858
Works around a crash for apps that inject custom
TypedArrays, which is completely unsupported, but
given the ease with which the crash can be worked
just going with higher compatibility on this one.

Test: App referenced in bug launches

Change-Id: Iac9a9b4fefd08815544211ffa49b02259920381f
parent a5e50e26

core/java/android/content/res/TypedArray.java

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public class TypedArray { 
        final int dataLen = len * AssetManager.STYLE_NUM_ENTRIES;

        final int indicesLen = len + 1;

        final VMRuntime runtime = VMRuntime.getRuntime();

        if (mData == null || mData.length < dataLen) {

        if (mDataAddress == 0 || mData.length < dataLen) {

            mData = (int[]) runtime.newNonMovableArray(int.class, dataLen);

            mDataAddress = runtime.addressOf(mData);

            mIndices = (int[]) runtime.newNonMovableArray(int.class, indicesLen);