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

Commit 98d728cd authored by Ryan Mitchell's avatar Ryan Mitchell Committed by android-build-merger
Browse files

Merge "Fix RelativeLayout checking of resource ids greater than 0x80" into qt-dev am: 44ad3ea2 

am: 85a00e3c

Change-Id: Idbdf5a82db213ccf7368c0cfe4e5ec45c16f5447
parents 41f9734d 85a00e3c

core/java/android/widget/RelativeLayout.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1; 
import android.annotation.NonNull;

import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.res.ResourceId;

import android.content.res.TypedArray;

import android.graphics.Rect;

import android.os.Build;
@@ -1991,7 +1992,7 @@ public class RelativeLayout extends ViewGroup { 
                // dependencies for a specific set of rules

                for (int j = 0; j < rulesCount; j++) {

                    final int rule = rules[rulesFilter[j]];

                    if (rule > 0) {

                    if (ResourceId.isValid(rule)) {

                        // The node this node depends on

                        final Node dependency = keyNodes.get(rule);

                        // Skip unknowns and self dependencies