Commit 40237e96 authored Jan 27, 2021 by James Mattis Committed by Automerger Merge Worker Jan 27, 2021

Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 am: 96ccce19 am:...

Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 am: 96ccce19 am: 7329e83d am: b214f23e am: 1096fbb7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ebb6d27231bba3ba0b21cea53372bae8ffc3923

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

+361 −160

File changed.

Preview size limit exceeded, changes collapsed.