From 3b49f07a452e0a77c1d22db2065255689a461d31 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Mon, 17 Sep 2012 10:21:43 -0700 Subject: Add UserManager.getUserIcon() So that we don't abuse the setUserIcon() for reading. So the new method won't try to create the file, only return it if it exists. Change-Id: I7a81d3f1b29d14d37e71f531744ce39f21d827ac --- core/java/android/os/IUserManager.aidl | 1 + core/java/android/os/UserManager.java | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) (limited to 'core') diff --git a/core/java/android/os/IUserManager.aidl b/core/java/android/os/IUserManager.aidl index c7a8493..653c5f3 100644 --- a/core/java/android/os/IUserManager.aidl +++ b/core/java/android/os/IUserManager.aidl @@ -28,6 +28,7 @@ interface IUserManager { boolean removeUser(int userHandle); void setUserName(int userHandle, String name); ParcelFileDescriptor setUserIcon(int userHandle); + ParcelFileDescriptor getUserIcon(int userHandle); List getUsers(); UserInfo getUserInfo(int userHandle); void setGuestEnabled(boolean enable); diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index de8e78c..cac1e07 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -166,6 +166,22 @@ public class UserManager { } /** + * Returns a file descriptor for the user's photo. PNG data can be read from this file. + * @param userHandle the user whose photo we want to read. + * @return a {@link ParcelFileDescriptor} from which to read the file, or null if there's no + * photo. + * @hide + */ + public ParcelFileDescriptor getUserIcon(int userHandle) { + try { + return mService.getUserIcon(userHandle); + } catch (RemoteException re) { + Log.w(TAG, "Could not set the user icon ", re); + return null; + } + } + + /** * Enable or disable the use of a guest account. If disabled, the existing guest account * will be wiped. * Requires {@link android.Manifest.permission#MANAGE_USERS} permission. -- cgit v1.1