Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31703d82 authored by Cody Kesting's avatar Cody Kesting Committed by Automerger Merge Worker
Browse files

Merge changes from topic "vcn-status-changed" am: 46c10cbc am: c74b9c7a... 

Merge changes from topic "vcn-status-changed" am: 46c10cbc am: c74b9c7a am: c33747c5 am: 44f96478

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

Change-Id: I28d2229ce0af500c5999cd6cb238aa261613b1b2
parents 6f108382 44f96478

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -26965,7 +26965,7 @@ package android.net.vcn { 
  public abstract static class VcnManager.VcnStatusCallback {

    ctor public VcnManager.VcnStatusCallback();

    method public abstract void onGatewayConnectionError(@NonNull int[], int, @Nullable Throwable);

    method public abstract void onVcnStatusChanged(int);

    method public abstract void onStatusChanged(int);

  }















}

























core/java/android/net/vcn/VcnManager.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -439,7 +439,7 @@ public class VcnManager {













         * @param statusCode the code for the status change encountered by this {@link















         *     VcnStatusCallback}'s subscription group.















         */













        public abstract void onVcnStatusChanged(@VcnStatusCode int statusCode);













        public abstract void onStatusChanged(@VcnStatusCode int statusCode);































        /**















         * Invoked when a VCN Gateway Connection corresponding to this callback's subscription group










@@ -476,7 +476,7 @@ public class VcnManager {













     * and there is a VCN active for its specified subscription group (this may happen after the















     * callback is registered).















     *













     * <p>{@link VcnStatusCallback#onVcnStatusChanged(int)} will be invoked on registration with the













     * <p>{@link VcnStatusCallback#onStatusChanged(int)} will be invoked on registration with the















     * current status for the specified subscription group's VCN. If the registrant is not















     * privileged for this subscription group, {@link #VCN_STATUS_CODE_NOT_CONFIGURED} will be















     * returned.










@@ -580,7 +580,7 @@ public class VcnManager {













        @Override















        public void onVcnStatusChanged(@VcnStatusCode int statusCode) {















            Binder.withCleanCallingIdentity(













                    () -> mExecutor.execute(() -> mCallback.onVcnStatusChanged(statusCode)));













                    () -> mExecutor.execute(() -> mCallback.onStatusChanged(statusCode)));















        }































        // TODO(b/180521637): use ServiceSpecificException for safer Exception 'parceling'

































tests/vcn/java/android/net/vcn/VcnManagerTest.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -204,7 +204,7 @@ public class VcnManagerTest {













                new VcnStatusCallbackBinder(INLINE_EXECUTOR, mMockStatusCallback);































        cbBinder.onVcnStatusChanged(VCN_STATUS_CODE_ACTIVE);













        verify(mMockStatusCallback).onVcnStatusChanged(VCN_STATUS_CODE_ACTIVE);













        verify(mMockStatusCallback).onStatusChanged(VCN_STATUS_CODE_ACTIVE);































        cbBinder.onGatewayConnectionError(















                UNDERLYING_NETWORK_CAPABILITIES,