diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-10-20 10:37:15 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-10-20 10:37:15 -0700 |
| commit | f912beb2ee4b75af1fe8c710d6948b9737fed531 (patch) | |
| tree | a8e5ae80d822105c36ff218b739b735a4d5ba9f6 /src/com/android/launcher3/compat/UserManagerCompatVL.java | |
| parent | 38ac73a095c99c18ca31b8d9cd14959a762928b7 (diff) | |
| parent | fe3db428abc07d253b816bf70d6820a8339becbc (diff) | |
| download | android_packages_apps_Trebuchet-f912beb2ee4b75af1fe8c710d6948b9737fed531.tar.gz android_packages_apps_Trebuchet-f912beb2ee4b75af1fe8c710d6948b9737fed531.tar.bz2 android_packages_apps_Trebuchet-f912beb2ee4b75af1fe8c710d6948b9737fed531.zip | |
resolve merge conflicts of fe3db428ab to ub-launcher3-master.
Change-Id: Icc60a61f621fefe9db67b178921e62f7d72d7e5a
Diffstat (limited to 'src/com/android/launcher3/compat/UserManagerCompatVL.java')
| -rw-r--r-- | src/com/android/launcher3/compat/UserManagerCompatVL.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/compat/UserManagerCompatVL.java b/src/com/android/launcher3/compat/UserManagerCompatVL.java index 9df7f5aa5..c53d702b7 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatVL.java +++ b/src/com/android/launcher3/compat/UserManagerCompatVL.java @@ -24,7 +24,6 @@ import android.content.pm.PackageManager; import android.os.Build; import android.os.UserHandle; -import com.android.launcher3.LauncherAppState; import com.android.launcher3.Utilities; import com.android.launcher3.util.LongArrayMap; @@ -98,8 +97,7 @@ public class UserManagerCompatVL extends UserManagerCompatV17 { if (Utilities.ATLEAST_MARSHMALLOW) { return mUserManager.getUserCreationTime(user.getUser()); } - SharedPreferences prefs = mContext.getSharedPreferences( - LauncherAppState.getSharedPreferencesKey(), Context.MODE_PRIVATE); + SharedPreferences prefs = Utilities.getPrefs(mContext); String key = USER_CREATION_TIME_KEY + getSerialNumberForUser(user); if (!prefs.contains(key)) { prefs.edit().putLong(key, System.currentTimeMillis()).apply(); |