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

Commit 3445bdbb authored by kxxt's avatar kxxt Committed by LuK1337
Browse files

SystemUI: Avoid using null Context in onTuningChanged() 

After switching user, we might reach onTuningChanged() before fragment
is attached, resulting in getContext() returning null, which then leads
to NPE.

Change-Id: Ia73412b3b6438bca18d09ab39db7f0657f3675a5
parent ec54181d

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java

+5 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.app.Fragment;

import android.content.Context;

import android.content.Intent;

import android.database.ContentObserver;

import android.os.Bundle;
@@ -141,6 +142,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
    private final Executor mMainExecutor;

    private final DumpManager mDumpManager;

    private ClockController mClockController;

    private Context mContext;

    private boolean mIsClockBlacklisted;



    private List<String> mBlockedIcons = new ArrayList<>();
@@ -272,6 +274,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        initEmergencyCryptkeeperText();

        initOperatorName();

        initNotificationIconArea();



        mContext = getContext();

        Dependency.get(TunerService.class).addTunable(this, StatusBarIconController.ICON_HIDE_LIST);



        mSystemEventAnimator =
@@ -368,7 +372,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
    public void onTuningChanged(String key, String newValue) {

        boolean wasClockBlacklisted = mIsClockBlacklisted;

        mIsClockBlacklisted = StatusBarIconController.getIconHideList(

                getContext(), newValue).contains("clock");

                mContext, newValue).contains("clock");

        if (wasClockBlacklisted && !mIsClockBlacklisted) {

            showClock(false);

        }