commit 1474024e5955285ed5185c38c25ad421892a20b4
author Remi NGUYEN VAN <reminv@google.com> Fri Apr 09 01:05:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 09 01:05:40 2021 +0000
tree 0e358dc7ae7db6ae7dae99bb6094f7b15afa9108
parent e9aecbb5d262c6629228709dfad5134530a871d6
parent 793d607d75f0d9c4e1906e5cd3839526983088b3

Merge "Replace IS_DEBUGGABLE with isDebuggable module API" am: 793d607d75

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667304

Change-Id: I52e7aaca589eefb385cec78bf4372922d8089018

services/core/java/com/android/server/ConnectivityService.java

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.