Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topics "downloadable_init_change_1", "downloadable_init_change_2" am: f2193be3f0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c3db4f27432f9bdc5433a23c1f60d951fb32836
This commit is contained in:
Jiashen Wang
2021-01-28 21:04:20 +00:00
committed by Automerger Merge Worker
parent bff8fecf85 f2193be3f0
commit 7556b81f80
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
telephony/java/android/telephony/euicc/DownloadableSubscription.java
View File

@@ -121,25 +121,21 @@ public final class DownloadableSubscription implements Parcelable {
}
public Builder(@NonNull String encodedActivationCode) {
Preconditions.checkNotNull(encodedActivationCode, "Activation code may not be null");
this.encodedActivationCode = encodedActivationCode;
}
/**
* Builds a {@link DownloadableSubscription} object. If the encoded activation code is
* {@code null}, a {@link NullPointerException} will be thrown.
* Builds a {@link DownloadableSubscription} object.
* @return a non-null {@link DownloadableSubscription} object.
*/
@NonNull
public DownloadableSubscription build() {
Preconditions.checkNotNull(encodedActivationCode, "Activation code may not be null");
return new DownloadableSubscription(encodedActivationCode, confirmationCode,
carrierName, accessRules);
}
/**
* Sets the encoded activation code. If the encoded activation code is {@code null}, a
* {@link NullPointerException} will be thrown.
* Sets the encoded activation code.
* @param value the activation code to use. An activation code can be parsed from a user
* scanned QR code. The format of activation code is defined in SGP.22. For
* example, "1$SMDP.GSMA.COM$04386-AGYFT-A74Y8-3F815$1.3.6.1.4.1.31746". For
@@ -147,7 +143,6 @@ public final class DownloadableSubscription implements Parcelable {
*/
@NonNull
public Builder setEncodedActivationCode(@NonNull String value) {
Preconditions.checkNotNull(encodedActivationCode, "Activation code may not be null");
encodedActivationCode = value;
return this;
}