| commit | 70c7bba941c7a1ea84026b43553eb6a73de13b48 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Fri Apr 09 01:24:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 09 01:24:14 2021 +0000 |
| tree | 0e358dc7ae7db6ae7dae99bb6094f7b15afa9108 | |
| parent | 19381a5938b16ae22c6851b5d0e25ebc6f822a3c [diff] | |
| parent | 1474024e5955285ed5185c38c25ad421892a20b4 [diff] |
Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: 793d607d75 am: 1474024e59 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304 Change-Id: Iaec8ac01bbb518af8e14c0936cf8d8f2f75d8dd4
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 5aa3e5b..3066717 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -7677,7 +7677,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.