summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRajeev Kumar <rajekumar@google.com>2017-06-12 21:01:02 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-12 21:01:02 +0000
commit66e2b3b5b53a5793cd7c9febe8dd3d81da98274b (patch)
treeb3af5d61ea126794dbefc23475aec4e668341664
parentbddec52ad1fd1c2b9df259cbad6881247c0da8a7 (diff)
parent98e063e6dfdcf1f33a5be308d8fa4e1dc92bb8df (diff)
downloadandroid_packages_apps_Trebuchet-66e2b3b5b53a5793cd7c9febe8dd3d81da98274b.tar.gz
android_packages_apps_Trebuchet-66e2b3b5b53a5793cd7c9febe8dd3d81da98274b.tar.bz2
android_packages_apps_Trebuchet-66e2b3b5b53a5793cd7c9febe8dd3d81da98274b.zip
Merge "Fix synchronization on a non-final field 'sInstanceLock' by making it final." into ub-launcher3-dorval-polish
am: 98e063e6df Change-Id: I5dd3e60f39a33645b8d29b64d975384047eceeb0
-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) {