Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace user with debuggable check in ConnectivityService" am: 8773546980 am: ad5abee88b am: ed45defb30

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c8746e54e1461c54f8064f9fd016361b5f2e6ef
This commit is contained in:
Remi NGUYEN VAN
2021-03-05 07:10:18 +00:00
committed by Automerger Merge Worker
parent c98f30af66 ed45defb30
commit 072e6e15be
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -7248,7 +7248,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.