summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRajeev Kumar <rajekumar@google.com>2017-06-12 20:55:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-12 20:55:45 +0000
commit98e063e6dfdcf1f33a5be308d8fa4e1dc92bb8df (patch)
treeb1972646d35579d9d0883b29550a271ee46cd7d0
parent76a3d918993a75e8c93554594c80b8c1a684ef7b (diff)
parentbf3366f0d9d5f3c99907cc3f74d41b3ec628dcd4 (diff)
downloadpackages_apps_Trebuchet-98e063e6dfdcf1f33a5be308d8fa4e1dc92bb8df.tar.gz
packages_apps_Trebuchet-98e063e6dfdcf1f33a5be308d8fa4e1dc92bb8df.tar.bz2
packages_apps_Trebuchet-98e063e6dfdcf1f33a5be308d8fa4e1dc92bb8df.zip
Merge "Fix synchronization on a non-final field 'sInstanceLock' by making it final." into ub-launcher3-dorval-polish
-rw-r--r--src/com/android/launcher3/compat/LauncherAppsCompat.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/compat/LauncherAppsCompat.java b/src/com/android/launcher3/compat/LauncherAppsCompat.java
index 26f4ae721..75a2a5d18 100644
--- a/src/com/android/launcher3/compat/LauncherAppsCompat.java
+++ b/src/com/android/launcher3/compat/LauncherAppsCompat.java
@@ -25,11 +25,9 @@ import android.graphics.Rect;
import android.os.Bundle;
import android.os.UserHandle;
import android.support.annotation.Nullable;
-
import com.android.launcher3.Utilities;
import com.android.launcher3.shortcuts.ShortcutInfoCompat;
import com.android.launcher3.util.PackageUserKey;
-
import java.util.List;
public abstract class LauncherAppsCompat {
@@ -50,7 +48,7 @@ public abstract class LauncherAppsCompat {
}
private static LauncherAppsCompat sInstance;
- private static Object sInstanceLock = new Object();
+ private static final Object sInstanceLock = new Object();
public static LauncherAppsCompat getInstance(Context context) {
synchronized (sInstanceLock) {