diff options
| author | Cody Kesting <ckesting@google.com> | 2021-03-23 17:10:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-23 17:10:51 +0000 |
| commit | 46c10cbc4da41c9e6d01663d5fd0d63d1e877757 (patch) | |
| tree | f9469b993738c41080d6d3e7449b8081a6738741 /core | |
| parent | 9446a5239fe2b66ca2fec700093fc112b7ccdd74 (diff) | |
| parent | c57281504ef66c4d823f3f3cab2e6fd3000c82d1 (diff) | |
Merge changes from topic "vcn-status-changed"
* changes:
Rename VcnStatusCallback#onVcnStatusChanged.
Reevaluate VcnGatewayConnections on receiving new configs.
Diffstat (limited to 'core')
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/net/vcn/VcnManager.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 82393f427f9b..419fe908e3d4 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -25723,7 +25723,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); } } diff --git a/core/java/android/net/vcn/VcnManager.java b/core/java/android/net/vcn/VcnManager.java index b73fdbff8ef3..c0189e2202d2 100644 --- a/core/java/android/net/vcn/VcnManager.java +++ b/core/java/android/net/vcn/VcnManager.java @@ -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' |