Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API"

This commit is contained in:
Junyu Lai
2021-01-29 17:15:28 +00:00
committed by Gerrit Code Review

View File

@@ -16,6 +16,8 @@
package android.net; package android.net;
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SystemApi; import android.annotation.SystemApi;
@@ -125,6 +127,7 @@ public final class NetworkAgentConfig implements Parcelable {
* @return the subscriber ID, or null if none. * @return the subscriber ID, or null if none.
* @hide * @hide
*/ */
@SystemApi(client = MODULE_LIBRARIES)
@Nullable @Nullable
public String getSubscriberId() { public String getSubscriberId() {
return subscriberId; return subscriberId;
@@ -275,6 +278,7 @@ public final class NetworkAgentConfig implements Parcelable {
* @hide * @hide
*/ */
@NonNull @NonNull
@SystemApi(client = MODULE_LIBRARIES)
public Builder setSubscriberId(@Nullable String subscriberId) { public Builder setSubscriberId(@Nullable String subscriberId) {
mConfig.subscriberId = subscriberId; mConfig.subscriberId = subscriberId;
return this; return this;