diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-11-24 13:12:32 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-11-24 13:12:32 -0800 |
commit | 0c34443406cd441566dd1d51d05a431a974f8edd (patch) | |
tree | 6b34fa89c9c5b2f105ecb84b2e11dc1e0371efb6 /src/com/android/launcher3/compat | |
parent | ed3563a279ea270ae70d3be115b676e0363eb052 (diff) | |
parent | 7bce5f7988d63e6f64db4b8482f781cc63820246 (diff) | |
download | android_packages_apps_Trebuchet-0c34443406cd441566dd1d51d05a431a974f8edd.tar.gz android_packages_apps_Trebuchet-0c34443406cd441566dd1d51d05a431a974f8edd.tar.bz2 android_packages_apps_Trebuchet-0c34443406cd441566dd1d51d05a431a974f8edd.zip |
resolve merge conflicts of 7bce5f7988 to ub-launcher3-master.
Change-Id: Id352ce219bed7701956bb462ea2dd0a5aebe7317
Diffstat (limited to 'src/com/android/launcher3/compat')
-rw-r--r-- | src/com/android/launcher3/compat/PackageInstallerCompatVL.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java index 6424e0379..4aa667ed0 100644 --- a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java +++ b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java @@ -43,7 +43,6 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat { PackageInstallerCompatVL(Context context) { mInstaller = context.getPackageManager().getPackageInstaller(); - LauncherAppState.setApplicationContext(context.getApplicationContext()); mCache = LauncherAppState.getInstance().getIconCache(); mWorker = new Handler(LauncherModel.getWorkerLooper()); |