From 86837945e989cf9296d916281062482cae81576e Mon Sep 17 00:00:00 2001
From: cretin45 <cretin45@gmail.com>
Date: Tue, 10 Feb 2015 12:26:59 -0800
Subject: [PATCH] SetupWizard: Add helpers for multiuser

Change-Id: I37345661e451523ccc571069646054071381358d
---
 .../setupwizard/ui/SetupWizardActivity.java           |  5 +----
 .../setupwizard/util/SetupWizardUtils.java            | 11 +++++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
index 488551d..b0c49c7 100644
--- a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
+++ b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
@@ -19,14 +19,12 @@ package com.cyanogenmod.setupwizard.ui;
 import android.animation.Animator;
 import android.app.Activity;
 import android.app.AppGlobals;
-import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
-import android.os.UserManager;
 import android.provider.Settings;
 import android.view.MotionEvent;
 import android.view.View;
@@ -112,8 +110,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
         } catch (Settings.SettingNotFoundException e) {
             // Continue with setup
         }
-        UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
-        mIsGuestUser =  userManager.isGuestUser();
+        mIsGuestUser =  SetupWizardUtils.isGuestUser(this);
         if (mIsGuestUser) {
             finishSetup();
         }
diff --git a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
index 46ef681..3803b93 100644
--- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
+++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
@@ -27,6 +27,8 @@ import android.content.pm.ResolveInfo;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 
@@ -140,6 +142,15 @@ public class SetupWizardUtils {
         return true;
     }
 
+    public static boolean isGuestUser(Context context) {
+        UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        return userManager.isGuestUser();
+    }
+
+    public static boolean isOwner() {
+        return UserHandle.getCallingUserHandle().isOwner();
+    }
+
     public static boolean hasGMS(Context context) {
         return GooglePlayServicesUtil.isGooglePlayServicesAvailable(context) !=
                 ConnectionResult.SERVICE_MISSING;