diff --git a/api/current.txt b/api/current.txt
index a5a8fc874a366..30028aedb5d90 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -16593,6 +16593,7 @@ package android.os {
 
   public class UserManager {
     method public java.lang.String getUserName();
+    method public boolean isUserAGoat();
   }
 
   public abstract class Vibrator {
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 2a5c1aa7efc46..96c96d76a4236 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -72,6 +72,15 @@ public class UserManager {
         }
     }
 
+   /**
+     * Used to determine whether the user making this call is subject to
+     * teleportations.
+     * @return whether the user making this call is a goat 
+     */
+    public boolean isUserAGoat() {
+        return false;
+    }
+ 
     /**
      * Returns the UserInfo object describing a specific user.
      * Requires {@link android.Manifest.permission#MANAGE_USERS} permission.