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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-12 19:00:18 +00:00
committed by Android (Google) Code Review
parent d7c6b89b32 9f6f9ca935
commit 44ad3ea220
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/widget/RelativeLayout.java
View File

@@ -21,6 +21,7 @@ import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.content.Context; import android.content.Context;
import android.content.res.ResourceId;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.Build; import android.os.Build;
@@ -1991,7 +1992,7 @@ public class RelativeLayout extends ViewGroup {
// dependencies for a specific set of rules // dependencies for a specific set of rules
for (int j = 0; j < rulesCount; j++) { for (int j = 0; j < rulesCount; j++) {
final int rule = rules[rulesFilter[j]]; final int rule = rules[rulesFilter[j]];
if (rule > 0) { if (ResourceId.isValid(rule)) {
// The node this node depends on // The node this node depends on
final Node dependency = keyNodes.get(rule); final Node dependency = keyNodes.get(rule);
// Skip unknowns and self dependencies // Skip unknowns and self dependencies