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

Commit 3d40072e authored by shawnlin's avatar shawnlin
Browse files

Fix null exception on config change when ScreenDecoration is disabled 

Return early on callbacks
  - onConfigurationChanged()
  - onTuningChanged()

Bug: 169438063
Test: 1. disable ScreenDecorations:
         - adb shell setprop debug.disable_screen_decorations true
	 - adb shell pidof com.android.systemui |xargs -i adb shell kill -9 {}
      2. rotate device
Change-Id: Icadfdd0f10e252677392443f3280e5620d0fa797
parent 7518e291

packages/SystemUI/src/com/android/systemui/ScreenDecorations.java

+8 −0
Original line number Diff line number Diff line
@@ -582,6 +582,10 @@ public class ScreenDecorations extends SystemUI implements Tunable { 


    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        if (DEBUG_DISABLE_SCREEN_DECORATIONS) {

            Log.i(TAG, "ScreenDecorations is disabled");

            return;

        }

        mHandler.post(() -> {

            int oldRotation = mRotation;

            mPendingRotationChange = false;
@@ -766,6 +770,10 @@ public class ScreenDecorations extends SystemUI implements Tunable { 


    @Override

    public void onTuningChanged(String key, String newValue) {

        if (DEBUG_DISABLE_SCREEN_DECORATIONS) {

            Log.i(TAG, "ScreenDecorations is disabled");

            return;

        }

        mHandler.post(() -> {

            if (mOverlays == null) return;

            if (SIZE.equals(key)) {