| commit | 08c07c9fd26e3027954afcdb82a7460ad2b10884 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Fri Mar 05 07:10:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 05 07:10:18 2021 +0000 |
| tree | 39e70b2a7136c8638ab0aa7b056a95ff8e5f6caf | |
| parent | 2e68a8ee6ecbfd89fbbddc5c97b72d8b81b7a0c9 [diff] | |
| parent | 68d10c47dfd15ede02c6c7d28e42d4bb4ea4af30 [diff] |
Merge "Replace user with debuggable check in ConnectivityService" am: a923322f24 am: 4386582dd2 am: 68d10c47df Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615085 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2c8746e54e1461c54f8064f9fd016361b5f2e6ef
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index a1bee02..cbb29a3 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -7248,7 +7248,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.