diff options
| -rw-r--r-- | INTENT_OWNERS | 3 | ||||
| -rw-r--r-- | core/java/android/content/OWNERS | 4 | ||||
| -rw-r--r-- | core/java/android/hardware/usb/OWNERS | 4 | ||||
| -rw-r--r-- | core/java/android/view/contentprotection/OWNERS | 4 | ||||
| -rw-r--r-- | core/tests/coretests/OWNERS | 1 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/content/OWNERS | 2 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/view/contentprotection/OWNERS | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Vpn.java | 21 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/contentcapture/OWNERS | 4 | ||||
| -rw-r--r-- | services/usb/OWNERS | 4 |
10 files changed, 46 insertions, 5 deletions
diff --git a/INTENT_OWNERS b/INTENT_OWNERS new file mode 100644 index 000000000000..58b5f2a61be0 --- /dev/null +++ b/INTENT_OWNERS @@ -0,0 +1,3 @@ +include /PACKAGE_MANAGER_OWNERS +include /services/core/java/com/android/server/wm/OWNERS +include /services/core/java/com/android/server/am/OWNERS diff --git a/core/java/android/content/OWNERS b/core/java/android/content/OWNERS index 2cde539ab1f8..d984633ab8b4 100644 --- a/core/java/android/content/OWNERS +++ b/core/java/android/content/OWNERS @@ -5,9 +5,7 @@ per-file *Content* = file:/services/core/java/com/android/server/am/OWNERS per-file *Sync* = file:/services/core/java/com/android/server/am/OWNERS per-file IntentFilter.java = file:/PACKAGE_MANAGER_OWNERS per-file IntentFilter.java = file:/services/core/java/com/android/server/am/OWNERS -per-file Intent.java = file:/PACKAGE_MANAGER_OWNERS -per-file Intent.java = file:/services/core/java/com/android/server/wm/OWNERS -per-file Intent.java = file:/services/core/java/com/android/server/am/OWNERS +per-file Intent.java = file:/INTENT_OWNERS per-file AutofillOptions* = file:/core/java/android/service/autofill/OWNERS per-file ContentCaptureOptions* = file:/core/java/android/service/contentcapture/OWNERS per-file LocusId* = file:/core/java/android/service/contentcapture/OWNERS diff --git a/core/java/android/hardware/usb/OWNERS b/core/java/android/hardware/usb/OWNERS index 8f5c2a025672..a753f9634d0d 100644 --- a/core/java/android/hardware/usb/OWNERS +++ b/core/java/android/hardware/usb/OWNERS @@ -1,3 +1,7 @@ # Bug component: 175220 +aprasath@google.com +kumarashishg@google.com +sarup@google.com +anothermark@google.com badhri@google.com diff --git a/core/java/android/view/contentprotection/OWNERS b/core/java/android/view/contentprotection/OWNERS new file mode 100644 index 000000000000..b3583a7f6ab1 --- /dev/null +++ b/core/java/android/view/contentprotection/OWNERS @@ -0,0 +1,4 @@ +# Bug component: 544200 + +include /core/java/android/view/contentcapture/OWNERS + diff --git a/core/tests/coretests/OWNERS b/core/tests/coretests/OWNERS index e8c9fe70272d..b7e008b196ff 100644 --- a/core/tests/coretests/OWNERS +++ b/core/tests/coretests/OWNERS @@ -2,3 +2,4 @@ include platform/frameworks/base:/services/core/java/com/android/server/am/OWNER per-file BinderTest.java = file:platform/frameworks/native:/libs/binder/OWNERS per-file ParcelTest.java = file:platform/frameworks/native:/libs/binder/OWNERS +per-file SurfaceControlRegistryTests.java = file:/services/core/java/com/android/server/wm/OWNERS diff --git a/core/tests/coretests/src/android/content/OWNERS b/core/tests/coretests/src/android/content/OWNERS index a69c6ffef8d8..6f38b848853b 100644 --- a/core/tests/coretests/src/android/content/OWNERS +++ b/core/tests/coretests/src/android/content/OWNERS @@ -5,3 +5,5 @@ per-file *Launcher* = file:/core/java/android/content/pm/LAUNCHER_OWNERS per-file *Shortcut* = file:/core/java/android/content/pm/SHORTCUT_OWNERS per-file *ComponentCallbacks* = file:/services/core/java/com/android/server/wm/OWNERS per-file *ComponentCallbacks* = charlesccchen@google.com +per-file ContentCaptureOptions* = file:/core/java/android/view/contentcapture/OWNERS + diff --git a/core/tests/coretests/src/android/view/contentprotection/OWNERS b/core/tests/coretests/src/android/view/contentprotection/OWNERS new file mode 100644 index 000000000000..b3583a7f6ab1 --- /dev/null +++ b/core/tests/coretests/src/android/view/contentprotection/OWNERS @@ -0,0 +1,4 @@ +# Bug component: 544200 + +include /core/java/android/view/contentcapture/OWNERS + diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 4208a12f91d4..d4bb445d66ac 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -3828,10 +3828,27 @@ public class Vpn { }, retryDelayMs, TimeUnit.MILLISECONDS); } + private boolean significantCapsChange(@Nullable final NetworkCapabilities left, + @Nullable final NetworkCapabilities right) { + if (left == right) return false; + return null == left + || null == right + || !Arrays.equals(left.getTransportTypes(), right.getTransportTypes()) + || !Arrays.equals(left.getCapabilities(), right.getCapabilities()) + || !Arrays.equals(left.getEnterpriseIds(), right.getEnterpriseIds()) + || !Objects.equals(left.getTransportInfo(), right.getTransportInfo()) + || !Objects.equals(left.getAllowedUids(), right.getAllowedUids()) + || !Objects.equals(left.getUnderlyingNetworks(), right.getUnderlyingNetworks()) + || !Objects.equals(left.getNetworkSpecifier(), right.getNetworkSpecifier()); + } + /** Called when the NetworkCapabilities of underlying network is changed */ public void onDefaultNetworkCapabilitiesChanged(@NonNull NetworkCapabilities nc) { - mEventChanges.log("[UnderlyingNW] Cap changed from " - + mUnderlyingNetworkCapabilities + " to " + nc); + if (significantCapsChange(mUnderlyingNetworkCapabilities, nc)) { + // TODO : make this log terser + mEventChanges.log("[UnderlyingNW] Cap changed from " + + mUnderlyingNetworkCapabilities + " to " + nc); + } final NetworkCapabilities oldNc = mUnderlyingNetworkCapabilities; mUnderlyingNetworkCapabilities = nc; if (oldNc == null || !nc.getSubscriptionIds().equals(oldNc.getSubscriptionIds())) { diff --git a/services/tests/servicestests/src/com/android/server/contentcapture/OWNERS b/services/tests/servicestests/src/com/android/server/contentcapture/OWNERS new file mode 100644 index 000000000000..b3583a7f6ab1 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/contentcapture/OWNERS @@ -0,0 +1,4 @@ +# Bug component: 544200 + +include /core/java/android/view/contentcapture/OWNERS + diff --git a/services/usb/OWNERS b/services/usb/OWNERS index 60172a36128e..d35dbb56437b 100644 --- a/services/usb/OWNERS +++ b/services/usb/OWNERS @@ -1,3 +1,7 @@ +aprasath@google.com +kumarashishg@google.com +sarup@google.com +anothermark@google.com badhri@google.com elaurent@google.com albertccwang@google.com |