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
This commit is contained in:
Remi NGUYEN VAN
2021-03-05 06:19:52 +00:00
committed by Automerger Merge Worker

View File

@@ -7255,7 +7255,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
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.