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

Commit 6f371498 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Prevent NPE in QuickQSPanel"

parents c261dd4f f13ce794

packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java

+2 −2
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ public class QuickQSPanel extends QSPanel { 
                record.tile.removeCallback(record.callback);

            }

            mTileLayout = mMediaTileLayout;

            setTiles(mHost.getTiles());

            if (mHost != null) setTiles(mHost.getTiles());

            mTileLayout.setListening(mListening);

            return true;

        } else if (!mMediaPlayer.hasMediaSession()
@@ -190,7 +190,7 @@ public class QuickQSPanel extends QSPanel { 
                record.tile.removeCallback(record.callback);

            }

            mTileLayout = mRegularTileLayout;

            setTiles(mHost.getTiles());

            if (mHost != null) setTiles(mHost.getTiles());

            mTileLayout.setListening(mListening);

            return true;

        }