From 72a3a0c7d24f629bca38ee2652491307e4e706da Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Fri, 25 Sep 2015 16:01:43 -0700
Subject: [PATCH] Fix OwnersTest when run with -e package

It was because UserManager.get() returns a static cached instance but
we should always be using the mock instance that's created for each test.

Bug 24378326

Change-Id: Id4663e7676d2d0130622055a97fbde0884714349
---
 .../java/com/android/server/devicepolicy/Owners.java         | 2 +-
 .../src/com/android/server/devicepolicy/DpmMockContext.java  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
index a1690828a4df9..370cf48b46555 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
@@ -101,7 +101,7 @@ class Owners {
 
     public Owners(Context context) {
         mContext = context;
-        mUserManager = UserManager.get(mContext);
+        mUserManager = context.getSystemService(UserManager.class);
     }
 
     /**
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
index f3d91600251e0..3b30a37bd2c02 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
@@ -218,6 +218,11 @@ public class DpmMockContext extends MockContext {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public String getSystemServiceName(Class<?> serviceClass) {
+        return realTestContext.getSystemServiceName(serviceClass);
+    }
+
     @Override
     public PackageManager getPackageManager() {
         return packageManager;