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

Merge "Fix the assumption in GetEuiccProfileInfoListResult." am: ee7a7f63a9

Browse Source 
am: 653b7f6059

Change-Id: I3affc2649067842c6b7a082ac11e28e34da836d9
This commit is contained in:
Holly Jiuyu Sun
2019-03-21 16:52:19 -07:00
committed by android-build-merger
parent 23984e2950 653b7f6059
commit d710627c77
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/service/euicc/GetEuiccProfileInfoListResult.java
View File

@@ -97,9 +97,10 @@ public final class GetEuiccProfileInfoListResult implements Parcelable {
if (this.result == EuiccService.RESULT_OK) { if (this.result == EuiccService.RESULT_OK) {
this.mProfiles = profiles; this.mProfiles = profiles;
} else { } else {
if (profiles != null) { // For error case, profiles is either null or 0 size.
if (profiles != null && profiles.length > 0) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Error result with non-null profiles: " + result); "Error result with non-empty profiles: " + result);
} }
this.mProfiles = null; this.mProfiles = null;
} }