Merge "Fix for goat detection code" into rvc-dev am: 7588f0d7a0 am: 8ced41c780 (a925a5c4) · Commits · e / os / android_frameworks_base

core/java/android/os/UserManager.java

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1729,9 +1729,15 @@ public class UserManager {
	* <p>As of {@link android.os.Build.VERSION_CODES#LOLLIPOP}, this method can		* <p>As of {@link android.os.Build.VERSION_CODES#LOLLIPOP}, this method can
	* now automatically identify goats using advanced goat recognition technology.</p>		* now automatically identify goats using advanced goat recognition technology.</p>
	*		*
	* @return Returns true if the user making this call is a goat.		* <p>As of {@link android.os.Build.VERSION_CODES#R}, this method always returns
			* {@code false} in order to protect goat privacy.</p>
			*
			* @return Returns whether the user making this call is a goat.
	*/		*/
	public boolean isUserAGoat() {		public boolean isUserAGoat() {
			if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.R) {
			return false;
			}
	return mContext.getPackageManager()		return mContext.getPackageManager()
	.isPackageAvailable("com.coffeestainstudios.goatsimulator");		.isPackageAvailable("com.coffeestainstudios.goatsimulator");
	}		}