summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Remi NGUYEN VAN <reminv@google.com> 2021-03-05 07:10:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-03-05 07:10:18 +0000
commit072e6e15be44262c71b16adbafe4aa51a41e8383 (patch)
treec6d43d79ef68b67923df08a2478d83ad47cfb6e7
parentc98f30af665e4b3703c61b5db9c6f173689003b3 (diff)
parented45defb30e7f5d23a8e4f10e4c735937dfe31d5 (diff)
Merge "Replace user with debuggable check in ConnectivityService" am: 8773546980 am: ad5abee88b am: ed45defb30
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615085 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2c8746e54e1461c54f8064f9fd016361b5f2e6ef
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index a1bee024171f..cbb29a3b1d6c 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -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.