PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing nullpointer exception when accessing StatsLogger before initialization" into tm-qpr-dev am: 24d7de43fb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19087430

Change-Id: I85ec0c26543e4042fb99e666d21629d7269e2428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sunny Goyal
2022-06-29 16:35:28 +00:00
committed by Automerger Merge Worker
parent 0c693832d5 24d7de43fb
commit 104bb034ab
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/BaseActivity.java
+1 -1
View File
@@ -77,8 +77,8 @@ public abstract class BaseActivity extends Activity implements AppLauncher,
new ArrayList<>(); new ArrayList<>();
protected DeviceProfile mDeviceProfile; protected DeviceProfile mDeviceProfile;
protected StatsLogManager mStatsLogManager;
protected SystemUiController mSystemUiController; protected SystemUiController mSystemUiController;
private StatsLogManager mStatsLogManager;
public static final int ACTIVITY_STATE_STARTED = 1 << 0; public static final int ACTIVITY_STATE_STARTED = 1 << 0;
src/com/android/launcher3/Launcher.java
+1 -1
View File
@@ -740,7 +740,7 @@ public class Launcher extends StatefulActivity<LauncherState>
completeAddAppWidget(appWidgetId, info, null, null); completeAddAppWidget(appWidgetId, info, null, null);
break; break;
case REQUEST_RECONFIGURE_APPWIDGET: 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); completeRestoreAppWidget(appWidgetId, LauncherAppWidgetInfo.RESTORE_COMPLETED);
break; break;
case REQUEST_BIND_PENDING_APPWIDGET: { case REQUEST_BIND_PENDING_APPWIDGET: {