commit e2bf6ae47f97d698cc006199d12b538a2a279f87
author Amith Yamasani <yamasani@google.com> Wed Jun 29 17:58:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 29 17:58:39 2016 +0000
tree 0716ed38a311ee7ed0002806490b9df15b8cb85b
parent 4f8b85626d7894486c347fd534b7dfa6b670d8dc
parent 94789a0203cd1dd07ea9cc7035de82fcfeb5b040

Use isDemoUser() API am: df26fb7df7
am: 94789a0203

Change-Id: Iaa2b1246072e2d62d43b85552113526ff342e0bf

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 166e6b4..692d3d5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,8 +19,6 @@
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <!-- TODO: Remove this when we decide between demo user and SUW-based demo mode -->
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
 
     <application
             android:allowBackup="false"

src/com/android/retaildemo/DemoPlayer.java

diff --git a/src/com/android/retaildemo/DemoPlayer.java b/src/com/android/retaildemo/DemoPlayer.java
index fcced3e..831ce53 100644
--- a/src/com/android/retaildemo/DemoPlayer.java
+++ b/src/com/android/retaildemo/DemoPlayer.java
@@ -102,7 +102,7 @@
 
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
-        if (UserManager.get(this).isDemoUser()) {
+        if (getSystemService(UserManager.class).isDemoUser()) {
             disableSelf();
         }
         return true;