commit 3667b31ae918e9186f577bd215c43218c2d3623a
author Cherie Cheung <cherieccy@google.com> Mon Feb 01 21:08:09 2021 +0900
committer Cherie Cheung <cherieccy@google.com> Mon Aug 23 10:51:59 2021 +0000
tree 4e03db4c503fe6f3b8b58f5ffedfbec949c82b5b
parent 00a8be3e37f652bd52ceb6579bb15bf161fb33f2

UserInfo.isDemo() to also check UserInfo.FLAG_DEMO

With the refactoring in ag/9507174, UserInfo.FLAG_DEMO is
deprecated, but ARC demo mode is still relying on it. This is
a temporary fix to keep ARC demo mode working. A proper fix will
be put in by b/179010471.

Bug: 178460880
Bug: 179010471
Test: UserManager.isDemoUser() returns true during ARC demo session.
Apps show demo mode behaviors.

Change-Id: I825d3e6c0a799005982372baa3fea5fa16c99fd2
(cherry picked from commit b652b79cb36166092063ff9df82e404129f67f3c)
(cherry picked from commit 3a72c3ec0bbc0a1dc41a8187c37504f3db4c1da1)