From 400bc93c71dbaffc276a3e0d631ee61414d7c8de Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Fri, 10 May 2019 17:44:52 -0700 Subject: [PATCH] Fix RelativeLayout rules A previous change restricted rules that are added to the rule dependency graph to resource ids rather than just integers greater that zero. Restore the previous behavior and also allow for negative resource ids to work as expected. Bug: 132447676 Test: loaded maps and view looks as expected Change-Id: I88d86c77c696d1e494a743fdd2e398283383c64e --- core/java/android/widget/RelativeLayout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 4c32f03f6cb35..d985528c38fb1 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -1992,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 (ResourceId.isValid(rule)) { + if (rule > 0 || ResourceId.isValid(rule)) { // The node this node depends on final Node dependency = keyNodes.get(rule); // Skip unknowns and self dependencies