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

Merge "Merge "Ensure getUserName cannot return null" into tm-dev am: 1503b56202 am: 10b45a2107 am: 7a5725bfe6" into tm-qpr-dev-plus-aosp am: 8971d3596d

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

Change-Id: I4fb5428a1b24934d4a75d0e655e1c40c287d6804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker
2022-05-04 20:08:20 +00:00
parent 0a576208bd 8971d3596d
commit 69e7fa15db
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/pm/UserInfo.java
View File

@@ -18,6 +18,7 @@ package android.content.pm;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.TestApi;
import android.annotation.UserIdInt;
import android.compat.annotation.UnsupportedAppUsage;
@@ -187,7 +188,7 @@ public class UserInfo implements Parcelable {
@UnsupportedAppUsage
public int serialNumber;
@UnsupportedAppUsage
public String name;
public @Nullable String name;
@UnsupportedAppUsage
public String iconPath;
@UnsupportedAppUsage