summaryrefslogtreecommitdiff
path: root/core/java/android/os/UserHandle.java
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2016-07-08 03:50:27 +0000
committerAndreas Gampe <agampe@google.com>2016-07-08 03:50:27 +0000
commitd281b4204a38d8cb542f2272b2d21203eafaff7b (patch)
tree480a596f413f7d34df2a3b017c181fae783f5add /core/java/android/os/UserHandle.java
parent6e16714c688ed9c52763696f5a5e7b90802a471b (diff)
Revert "Frameworks/base: Refactor UserHandle and Environment a bit"
Breaks monkey in root mode. This reverts commit 6e16714c688ed9c52763696f5a5e7b90802a471b. Bug: 29338430 Change-Id: I238f89dad77d7dcae6d02eccbda52eb9c6c6466c
Diffstat (limited to 'core/java/android/os/UserHandle.java')
-rw-r--r--core/java/android/os/UserHandle.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java
index 10e3718601ea..b3f44536214b 100644
--- a/core/java/android/os/UserHandle.java
+++ b/core/java/android/os/UserHandle.java
@@ -297,11 +297,7 @@ public final class UserHandle implements Parcelable {
*/
@SystemApi
public static @UserIdInt int myUserId() {
- int myUid = Process.myUid();
- if (myUid == 0) {
- throw new IllegalStateException("myUserId unsupported in zygote.");
- }
- return getUserId(myUid);
+ return getUserId(Process.myUid());
}
/**