From 977838b5687e9b80d28c53aa6fd671e3bbbf684a Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Mon, 27 Jun 2022 13:15:41 -0700 Subject: [PATCH] Fixing nullpointer exception when accessing StatsLogger before initialization Bug: 236227523 Test: Manual Change-Id: I2caaa143ab2ddd4442d5c56152c7b4a7c723b92b --- src/com/android/launcher3/BaseActivity.java | 2 +- src/com/android/launcher3/Launcher.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index 73d3e3301c..d34f535755 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -77,8 +77,8 @@ public abstract class BaseActivity extends Activity implements AppLauncher, new ArrayList<>(); protected DeviceProfile mDeviceProfile; - protected StatsLogManager mStatsLogManager; protected SystemUiController mSystemUiController; + private StatsLogManager mStatsLogManager; public static final int ACTIVITY_STATE_STARTED = 1 << 0; diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index ebed31bd54..9634926618 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -740,7 +740,7 @@ public class Launcher extends StatefulActivity completeAddAppWidget(appWidgetId, info, null, null); break; case REQUEST_RECONFIGURE_APPWIDGET: - mStatsLogManager.logger().withItemInfo(info).log(LAUNCHER_WIDGET_RECONFIGURED); + getStatsLogManager().logger().withItemInfo(info).log(LAUNCHER_WIDGET_RECONFIGURED); completeRestoreAppWidget(appWidgetId, LauncherAppWidgetInfo.RESTORE_COMPLETED); break; case REQUEST_BIND_PENDING_APPWIDGET: {