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

Commit f29573fe authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix errorprone warnings that should be errors"

parents 01e399e2 40de3204

src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ public class ContactEditorSpringBoardActivity extends AppCompatContactsActivity 
        finish();

    }



    @SuppressWarnings("MissingSuperCall") // TODO: Fix me

    @Override

    protected void onActivityResult(int requestCode, int resultCode, Intent data) {

        // Ignore failed requests

src/com/android/contacts/activities/PeopleActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements 
        getWindow().setBackgroundDrawable(null);

    }



    @SuppressWarnings("MissingSuperCall") // TODO: Fix me

    @Override

    protected void onNewIntent(Intent intent) {

        final String action = intent.getAction();
@@ -603,6 +604,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements 
        onSyncStateUpdated();

    }



    @SuppressWarnings("MissingSuperCall") // TODO: Fix me

    @Override

    public void onMultiWindowModeChanged(boolean entering) {

        initializeHomeVisibility();

src/com/android/contacts/editor/ContactEditorFragment.java

+5 −5
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ import com.google.common.collect.ImmutableList; 
import com.google.common.collect.Lists;



import java.io.FileNotFoundException;

import java.util.Arrays;

import java.util.ArrayList;

import java.util.Collections;

import java.util.HashSet;
@@ -132,11 +133,10 @@ public class ContactEditorFragment extends Fragment implements 
    private static final String KEY_PHOTO_RAW_CONTACT_ID = "photo_raw_contact_id";

    private static final String KEY_UPDATED_PHOTOS = "updated_photos";



    private static final List<String> VALID_INTENT_ACTIONS = new ArrayList<String>() {{

        add(Intent.ACTION_EDIT);

        add(Intent.ACTION_INSERT);

        add(ContactEditorActivity.ACTION_SAVE_COMPLETED);

    }};

    private static final List<String> VALID_INTENT_ACTIONS = Arrays.asList(

            Intent.ACTION_EDIT,

            Intent.ACTION_INSERT,

            ContactEditorActivity.ACTION_SAVE_COMPLETED);



    private static final String KEY_ACTION = "action";

    private static final String KEY_URI = "uri";

src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public class SuggestionEditConfirmationDialogFragment extends DialogFragment { 
        return new AlertDialog.Builder(getActivity())

                .setIconAttribute(android.R.attr.alertDialogIcon)

                .setMessage(R.string.aggregation_suggestion_edit_dialog_message)

                .setPositiveButton(android.R.string.yes,

                .setPositiveButton(android.R.string.ok,

                        new DialogInterface.OnClickListener() {

                            @Override

                            public void onClick(DialogInterface dialog, int whichButton) {
@@ -61,7 +61,7 @@ public class SuggestionEditConfirmationDialogFragment extends DialogFragment { 
                            }

                        }

                )

                .setNegativeButton(android.R.string.no, null)

                .setNegativeButton(android.R.string.cancel, null)

                .create();

    }

}

src/com/android/contacts/list/CustomContactListFilterActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -982,8 +982,8 @@ public class CustomContactListFilterActivity extends Activity implements 
        public Dialog onCreateDialog(Bundle savedInstanceState) {

            return new AlertDialog.Builder(getActivity(), getTheme())

                    .setMessage(R.string.leave_customize_confirmation_dialog_message)

                    .setNegativeButton(android.R.string.no, null)

                    .setPositiveButton(android.R.string.yes, this)

                    .setNegativeButton(android.R.string.cancel, null)

                    .setPositiveButton(android.R.string.ok, this)

                    .create();

        }