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

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

Merge "Fix errorprone warnings that should be errors"

parents f7200dd5 43ff8980

src/com/android/settings/TrustedCredentialsDialogBuilder.java

+2 −2
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ class TrustedCredentialsDialogBuilder extends AlertDialog.Builder { 
            } else {

                new AlertDialog.Builder(mActivity)

                        .setMessage(R.string.trusted_credentials_remove_confirmation)

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

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

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

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

                        .show();



            }

src/com/android/settings/accounts/AccountDashboardFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ public class AccountDashboardFragment extends DashboardFragment { 
                    return controllers;

                }



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

                @Override

                public List<SearchIndexableRaw> getDynamicRawDataToIndex(Context context,

                        boolean enabled) {

src/com/android/settings/applications/intentpicker/SupportedLinkWrapper.java

+2 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import java.util.stream.Collectors; 
 *  A buffer of the supported link data. This {@link SupportedLinkWrapper} wraps the host, enabled

 *  and a list of {@link DomainOwner}.

 */

public class SupportedLinkWrapper implements Comparable {

public class SupportedLinkWrapper implements Comparable<SupportedLinkWrapper> {

    private static final String TAG = "SupportedLinkWrapper";



    private String mHost;
@@ -112,8 +112,7 @@ public class SupportedLinkWrapper implements Comparable { 
    }



    @Override

    public int compareTo(Object o) {

        final SupportedLinkWrapper that = (SupportedLinkWrapper) o;

    public int compareTo(SupportedLinkWrapper that) {

        if (this.mIsEnabled != that.mIsEnabled) {

            return this.mIsEnabled ? -1 : 1;

        }

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java

+1 −0
Original line number Diff line number Diff line
@@ -713,6 +713,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 
        }

    }



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

    @Override

    public void onConfigurationChanged(@NonNull Configuration newConfig) {

        switch(newConfig.orientation) {

src/com/android/settings/development/DisableLogPersistWarningDialog.java

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ public class DisableLogPersistWarningDialog extends InstrumentedDialogFragment i 
        return new AlertDialog.Builder(getActivity())

                .setTitle(R.string.dev_logpersist_clear_warning_title)

                .setMessage(R.string.dev_logpersist_clear_warning_message)

                .setPositiveButton(android.R.string.yes, this /* onClickListener */)

                .setNegativeButton(android.R.string.no, this /* onClickListener */)

                .setPositiveButton(android.R.string.ok, this /* onClickListener */)

                .setNegativeButton(android.R.string.cancel, this /* onClickListener */)

                .create();

    }