commit a923322f24be2aade8701c9f0e34026efafffe19
author Remi NGUYEN VAN <reminv@google.com> Fri Mar 05 05:09:46 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 05 05:09:46 2021 +0000
tree 3527de419195233234c9a17256551525426689c3
parent b639d79547e744020215f4c2d8d572bbd4815be9
parent 2c6d33f451bba5b6aad24f3b5ffa61a2fe28b7d3

Merge "Replace user with debuggable check in ConnectivityService"

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index ceb4c9e..e55307f 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -7255,7 +7255,7 @@
         }
 
         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.