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

Commit 796f7c6f authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

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

parents 03f26722 5f56c1fd

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

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



    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
@@ -150,6 +150,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);