| commit | 89eae3bd33a9e19d132f53aa2ad7085d2d7468d5 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Fri Apr 09 01:30:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 09 01:30:00 2021 +0000 |
| tree | 1031d20125ead0ac0ea2aa04b93ad8aa45197f1a | |
| parent | 0eae121e2c25e525dc4c5f39e3494b0bd0bf6037 [diff] | |
| parent | 70c7bba941c7a1ea84026b43553eb6a73de13b48 [diff] |
Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: 793d607d75 am: 1474024e59 am: 70c7bba941 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304 Change-Id: I3a64653b1a9cb283ba04d4c5a363d3b44fa7b987
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 922b21a..4081fd5 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -7685,7 +7685,7 @@ } void addRequestReassignment(@NonNull final RequestReassignment reassignment) { - if (Build.IS_DEBUGGABLE) { + if (Build.isDebuggable()) { // 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.