Merge "UserInfo.isDemo() to also check UserInfo.FLAG_DEMO"

2021-08-24 00:59:43 +00:00
parent 9c25216cba 3667b31ae9
commit c299543b3a
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/content/pm/UserInfo.java
+++ b/core/java/android/content/pm/UserInfo.java
@@ -343,7 +343,7 @@ public class UserInfo implements Parcelable {
    }

    public boolean isDemo() {
-        return UserManager.isUserTypeDemo(userType);
+        return UserManager.isUserTypeDemo(userType) || (flags & FLAG_DEMO) != 0;
    }

    public boolean isFull() {