summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-08-21 16:47:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-21 16:47:09 +0000
commit6f326e95a0033eecbb7370c95ce14fa508a57448 (patch)
tree463340634bcf4e139c7208b9a534861b6a5292d4 /src/com
parent0b15838462332abc1b0cabc8b289dc8e4917e82c (diff)
parent93adff28ed9b6bf06eba97c1266b3fb911eca6a0 (diff)
downloadandroid_packages_apps_Trebuchet-6f326e95a0033eecbb7370c95ce14fa508a57448.tar.gz
android_packages_apps_Trebuchet-6f326e95a0033eecbb7370c95ce14fa508a57448.tar.bz2
android_packages_apps_Trebuchet-6f326e95a0033eecbb7370c95ce14fa508a57448.zip
am 93adff28: Merge "Using the usermanager api to get creation time" into ub-launcher3-burnaby
* commit '93adff28ed9b6bf06eba97c1266b3fb911eca6a0': Using the usermanager api to get creation time
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher3/compat/UserManagerCompatVL.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/compat/UserManagerCompatVL.java b/src/com/android/launcher3/compat/UserManagerCompatVL.java
index 4d404db2b..dc3ec3cd8 100644
--- a/src/com/android/launcher3/compat/UserManagerCompatVL.java
+++ b/src/com/android/launcher3/compat/UserManagerCompatVL.java
@@ -26,6 +26,7 @@ import android.os.Build;
import android.os.UserHandle;
import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.Utilities;
import com.android.launcher3.util.LongArrayMap;
import java.util.ArrayList;
@@ -100,7 +101,9 @@ public class UserManagerCompatVL extends UserManagerCompatV17 {
@Override
public long getUserCreationTime(UserHandleCompat user) {
- // TODO: Use system API once available.
+ if (Utilities.ATLEAST_MARSHMALLOW) {
+ return mUserManager.getUserCreationTime(user.getUser());
+ }
SharedPreferences prefs = mContext.getSharedPreferences(
LauncherAppState.getSharedPreferencesKey(), Context.MODE_PRIVATE);
String key = USER_CREATION_TIME_KEY + getSerialNumberForUser(user);