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

Commit 072e6e15 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:... 

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c8746e54e1461c54f8064f9fd016361b5f2e6ef
parents c98f30af ed45defb

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

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



        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

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

                // reassignments on all user devices.