| commit | 68d10c47dfd15ede02c6c7d28e42d4bb4ea4af30 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Fri Mar 05 06:19:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 05 06:19:52 2021 +0000 |
| tree | 3527de419195233234c9a17256551525426689c3 | |
| parent | e05c37b5ec8a475c8e560d9a97362963443deb36 [diff] | |
| parent | 4386582dd207f97ed91e324ef253c53eb247aee5 [diff] |
Merge "Replace user with debuggable check in ConnectivityService" am: a923322f24 am: 4386582dd2 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615085 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I00949470243a8ca63b401810bc9cb4ad3631e038
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.