LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API" am: bc1a11fdb2 am: d53184a4de

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcaddb813f501065921e55b6e8a33269c1f4f95f
This commit is contained in:
Junyu Lai
2021-01-29 23:22:35 +00:00
committed by Automerger Merge Worker
parent 55c1a77fea d53184a4de
commit bd6e9518e0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/NetworkAgentConfig.java
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;