Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1db6188f authored by Sunny Goyal's avatar Sunny Goyal Committed by Automerger Merge Worker
Browse files

Merge "Fixing nullpointer exception when accessing StatsLogger before... 

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

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



Change-Id: Id259b32db17f33f6d6d8217a18c9231bc34d1110
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4e0e3b87 104bb034

src/com/android/launcher3/BaseActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

src/com/android/launcher3/Launcher.java

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ public class Launcher extends StatefulActivity<LauncherState> 
                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: {