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

Commit ad5abee8 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Replace user with debuggable check in ConnectivityService" am: 87735469 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb729be68e810972506b1d8a3960dfc371a294b1
parents b2bc755a 87735469

services/core/java/com/android/server/ConnectivityService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -7255,7 +7255,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }

        }





        void addRequestReassignment(@NonNull final RequestReassignment reassignment) {

        void addRequestReassignment(@NonNull final RequestReassignment reassignment) {

            if (!Build.IS_USER) {

            if (Build.IS_DEBUGGABLE) {

                // The code is never supposed to add two reassignments of the same request. Make

                // The code is never supposed to add two reassignments of the same request. Make

                // sure this stays true, but without imposing this expensive check on all

                // sure this stays true, but without imposing this expensive check on all

                // reassignments on all user devices.

                // reassignments on all user devices.