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

Commit f5dcaef3 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "SystemUI: don't crash when user disable default apps" into cm-11.0

parents 56e4b9fb fdaa2de9

packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java

+5 −0
Original line number Diff line number Diff line
@@ -216,6 +216,11 @@ public class Clock extends TextView implements DemoMode, OnClickListener, OnLong 
    }



    private void collapseStartActivity(Intent what) {

        // don't do anything if the activity can't be resolved (e.g. app disabled)

        if (getContext().getPackageManager().resolveActivity(what, 0) == null) {

            return;

        }



        // collapse status bar

        StatusBarManager statusBarManager = (StatusBarManager) getContext().getSystemService(

                Context.STATUS_BAR_SERVICE);

packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java

+5 −0
Original line number Diff line number Diff line
@@ -124,6 +124,11 @@ public class DateView extends TextView implements OnClickListener, OnLongClickLi 
    }



    private void collapseStartActivity(Intent what) {

        // don't do anything if the activity can't be resolved (e.g. app disabled)

        if (getContext().getPackageManager().resolveActivity(what, 0) == null) {

            return;

        }



        // collapse status bar

        StatusBarManager statusBarManager = (StatusBarManager) getContext().getSystemService(

                Context.STATUS_BAR_SERVICE);