summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2013-04-25 21:22:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-25 21:22:31 -0700
commit83a6142173fbd3ddf5c4285e2b6359e44beaddb0 (patch)
treeabd64e96aebb1c3902fb0b220ea2b791d404a34a /api
parent7a21c4cdb172f6353cd4166e80910893dc981196 (diff)
parentbbd90f8e7051fde96092cacdebc5d94ce46c7140 (diff)
downloadframeworks_base-83a6142173fbd3ddf5c4285e2b6359e44beaddb0.zip
frameworks_base-83a6142173fbd3ddf5c4285e2b6359e44beaddb0.tar.gz
frameworks_base-83a6142173fbd3ddf5c4285e2b6359e44beaddb0.tar.bz2
am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-dev
* commit 'bbd90f8e7051fde96092cacdebc5d94ce46c7140': Hide isLinkedUser()
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index dcdf0ba..3418761 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17643,7 +17643,6 @@ package android.os {
method public java.lang.String getUserName();
method public android.os.Bundle getUserRestrictions();
method public android.os.Bundle getUserRestrictions(android.os.UserHandle);
- method public boolean isLinkedUser();
method public boolean isUserAGoat();
method public boolean isUserRunning(android.os.UserHandle);
method public boolean isUserRunningOrStopping(android.os.UserHandle);