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

Commit d0665d7a authored by Kshitij's avatar Kshitij
Browse files

fix: Prevent potential NPE on foregroundApp & home checks

parent f73fb38d

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks { 
     */

    private int mCutoutSideNudge = 0;



    private String mPreviousApp;

    private String mPreviousApp = "";

    private IActivityTaskManager mActivityTaskManager;

    private Handler mHandler = new Handler(Looper.getMainLooper());

    private final TaskStackListener mTaskListener = new TaskStackListener() {
@@ -105,7 +105,7 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks { 
        public void onTaskStackChanged() {

            try {

                String foregroundApp = getForegroundApp();

                if (!foregroundApp.equals(mPreviousApp)) {

                if (foregroundApp != null && !mPreviousApp.equals(foregroundApp)) {

                    mPreviousApp = foregroundApp;

                    mHandler.post(new Runnable() {

                        @Override
@@ -356,7 +356,7 @@ public class PhoneStatusBarView extends FrameLayout implements Callbacks { 
        String homePackageName = "";

        if (resolveInfo != null) {

            homePackageName = resolveInfo.activityInfo.packageName;

            isHomePackage = getForegroundApp().equals(homePackageName);

            isHomePackage = homePackageName != null && homePackageName.equals(getForegroundApp());

        }

        int dockWidth = !isHomePackage ? 0 : Settings.Secure.getInt(getContext().getContentResolver(), BLISS_LAUNCHER_DOCK_WIDTH, 0);

        View sbContents = findViewById(R.id.status_bar_contents);