summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Powell <adamp@google.com> 2014-09-18 01:27:39 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-09-18 01:27:40 +0000
commitcc340899cb50e4fa725a82b33e05554686e9a51b (patch)
treebacb8f98d44ea06c623d4cce006dea328c81c178
parentb610b18a8a4de957e0845f1cc5fc96a0526ecd95 (diff)
parent988ae30ff7729ac0e9a44ee665c7e00f1961e7cd (diff)
Merge "Fix UserManager#isUserAGoat" into lmp-dev
-rw-r--r--core/java/android/os/UserManager.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index c25278f19d9b..82016c305f90 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -19,6 +19,7 @@ import android.annotation.SystemApi;
import android.app.ActivityManager;
import android.app.ActivityManagerNative;
import android.content.Context;
+import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.graphics.Bitmap;
@@ -430,7 +431,8 @@ public class UserManager {
* @return whether the user making this call is a goat
*/
public boolean isUserAGoat() {
- return false;
+ return mContext.getPackageManager()
+ .isPackageAvailable("com.coffeestainstudios.goatsimulator");
}
/**