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

Commit ca343738 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update comment to use inclusive language" am: 3b791360 am: 03e5841e... 

Merge "Update comment to use inclusive language" am: 3b791360 am: 03e5841e am: cb45db06 am: 2d3240aa

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373954

Change-Id: I52cc89f4255c3613a86f91d12bd91a5474dace86
parents 32e22143 2d3240aa

core/java/android/security/net/config/NetworkSecurityConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ public final class NetworkSecurityConfig { 
         * in {@link Builder#build()}, recursively if needed.

         */

        public Builder setParent(Builder parent) {

            // Sanity check to avoid adding loops.

            // Quick check to avoid adding loops.

            Builder current = parent;

            while (current != null) {

                if (current == this) {