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

Commit 34b47532 authored by Anna Zappone's avatar Anna Zappone
Browse files

Default configuration activity to CANCELLED result 

In recent android builds, I've seen launcher freeze if the
ConfigurationActivity is closed without finishing successfully (rather
than ignored like in older builds). Manually setting the default result
as CANCELLED appears to fix it.

Test: local
Change-Id: Iba6bb0c68cbeb632cf01fad09433b8096baf86b5
parent a0af6cf7

packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java

+7 −2
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ public class PeopleSpaceActivity extends Activity { 
                INVALID_APPWIDGET_ID);

        mShowSingleConversation = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.PEOPLE_SPACE_CONVERSATION_TYPE, 0) == 0;

        setResult(RESULT_CANCELED);

        // Finish the configuration activity immediately if a widget is added for multiple

        // conversations. If the mAppWidgetId is INVALID, then the activity wasn't launched as a

        // widget configuration activity.
@@ -151,10 +152,14 @@ public class PeopleSpaceActivity extends Activity { 
    private void finishActivity() {

        if (PeopleSpaceUtils.DEBUG) Log.d(TAG, "Widget added!");

        mUiEventLogger.log(PeopleSpaceUtils.PeopleSpaceWidgetEvent.PEOPLE_SPACE_WIDGET_ADDED);

        setActivityResult(RESULT_OK);

        finish();

    }



    private void setActivityResult(int result) {

        Intent resultValue = new Intent();

        resultValue.putExtra(EXTRA_APPWIDGET_ID, mAppWidgetId);

        setResult(RESULT_OK, resultValue);

        finish();

        setResult(result, resultValue);

    }



    @Override