Commit 7329e83d authored Jan 27, 2021 by James Mattis Committed by Automerger Merge Worker Jan 27, 2021

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88af6ecc2d8cb7695029504b842e08d622f3d2ed

parents 18896c83 96ccce19

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

+361 −160

File changed.

Preview size limit exceeded, changes collapsed.