Skip to content

Commit 59420ec

Browse files
Fabrice Di MeglioAndroid (Google) Code Review
authored andcommitted
Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
2 parents 9bef329 + d3156a2 commit 59420ec

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

core/java/android/view/ViewGroup.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5990,11 +5990,6 @@ public int getLayoutDirection() {
59905990
*/
59915991
@Override
59925992
public void resolveLayoutDirection(int layoutDirection) {
5993-
// No need to resolve if it is the same layout direction as before
5994-
if (this.layoutDirection == layoutDirection) {
5995-
return;
5996-
}
5997-
59985993
setLayoutDirection(layoutDirection);
59995994

60005995
if (!isMarginRelative()) return;

0 commit comments

Comments
 (0)