diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/UserManager.java | 4 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java | 10 |
4 files changed, 10 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt index ee6a66755eb6..937cd19e7267 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23427,7 +23427,7 @@ package android.os { method public android.os.Bundle getApplicationRestrictions(java.lang.String); method public long getSerialNumberForUser(android.os.UserHandle); method public int getUserCount(); - method public long getUserCreationTime(int); + method public long getUserCreationTime(android.os.UserHandle); method public android.os.UserHandle getUserForSerialNumber(long); method public java.lang.String getUserName(); method public java.util.List<android.os.UserHandle> getUserProfiles(); diff --git a/api/system-current.txt b/api/system-current.txt index ee076c24f026..2117602f5d70 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -25319,7 +25319,7 @@ package android.os { method public android.os.Bundle getApplicationRestrictions(java.lang.String); method public long getSerialNumberForUser(android.os.UserHandle); method public int getUserCount(); - method public long getUserCreationTime(int); + method public long getUserCreationTime(android.os.UserHandle); method public android.os.UserHandle getUserForSerialNumber(long); method public java.lang.String getUserName(); method public java.util.List<android.os.UserHandle> getUserProfiles(); diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index afd995060380..b9e307fa24f9 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -1327,9 +1327,9 @@ public class UserManager { * calling user. * @return creation time in milliseconds since Epoch time. */ - public long getUserCreationTime(int userHandle) { + public long getUserCreationTime(UserHandle userHandle) { try { - return mService.getUserCreationTime(userHandle); + return mService.getUserCreationTime(userHandle.getIdentifier()); } catch (RemoteException re) { Log.w(TAG, "Could not get user creation time", re); return 0; diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java index bfa308ea09c3..2d47c248abf6 100644 --- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java @@ -138,14 +138,16 @@ public class UserManagerTest extends AndroidTestCase { assertNotNull(profile); assertTrue("creationTime must be set when the profile is created", profile.creationTime > 0); - assertEquals(profile.creationTime, mUserManager.getUserCreationTime(profile.id)); + assertEquals(profile.creationTime, mUserManager.getUserCreationTime( + new UserHandle(profile.id))); long ownerCreationTime = mUserManager.getUserInfo(UserHandle.USER_OWNER).creationTime; - assertEquals(ownerCreationTime, mUserManager.getUserCreationTime(UserHandle.USER_OWNER)); + assertEquals(ownerCreationTime, mUserManager.getUserCreationTime( + new UserHandle(UserHandle.USER_OWNER))); try { int noSuchUserId = 100500; - mUserManager.getUserCreationTime(noSuchUserId); + mUserManager.getUserCreationTime(new UserHandle(noSuchUserId)); fail("SecurityException should be thrown for nonexistent user"); } catch (Exception e) { assertTrue("SecurityException should be thrown for nonexistent user, but was: " + e, @@ -154,7 +156,7 @@ public class UserManagerTest extends AndroidTestCase { UserInfo user = createUser("User 1", 0); try { - mUserManager.getUserCreationTime(user.id); + mUserManager.getUserCreationTime(new UserHandle(user.id)); fail("SecurityException should be thrown for other user"); } catch (Exception e) { assertTrue("SecurityException should be thrown for other user, but was: " + e, |