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

Commit cd98358f authored by Tyler Gunn's avatar Tyler Gunn Committed by Gerrit Code Review
Browse files

Merge "Update language to comply with Android's inclusive language guidance"

parents 16b31355 d01d3582

src/java/com/android/internal/telephony/AppSmsManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -144,7 +144,7 @@ public class AppSmsManager { 
     * Handle an incoming SMS_DELIVER_ACTION intent if it is an app-only SMS.

     * Handle an incoming SMS_DELIVER_ACTION intent if it is an app-only SMS.

     */

     */

    public boolean handleSmsReceivedIntent(Intent intent) {

    public boolean handleSmsReceivedIntent(Intent intent) {

        // Sanity check the action.

        // Correctness check the action.

        if (intent.getAction() != Intents.SMS_DELIVER_ACTION) {

        if (intent.getAction() != Intents.SMS_DELIVER_ACTION) {

            Log.wtf(LOG_TAG, "Got intent with incorrect action: " + intent.getAction());

            Log.wtf(LOG_TAG, "Got intent with incorrect action: " + intent.getAction());

            return false;

            return false;

src/java/com/android/internal/telephony/CarrierSignalAgent.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -285,7 +285,7 @@ public class CarrierSignalAgent extends Handler { 




    /**

    /**

     * Broadcast the intents explicitly.

     * Broadcast the intents explicitly.

     * Some sanity check will be applied before broadcasting.

     * Some correctness checks will be applied before broadcasting.

     * - for non-wakeup(runtime) receivers, make sure the intent is not declared in their manifests

     * - for non-wakeup(runtime) receivers, make sure the intent is not declared in their manifests

     * and apply FLAG_EXCLUDE_STOPPED_PACKAGES to avoid wake-up

     * and apply FLAG_EXCLUDE_STOPPED_PACKAGES to avoid wake-up

     * - for wakeup(manifest) receivers, make sure there are matched receivers with registered

     * - for wakeup(manifest) receivers, make sure there are matched receivers with registered

src/java/com/android/internal/telephony/GsmCdmaCallTracker.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -790,7 +790,7 @@ public class GsmCdmaCallTracker extends CallTracker { 
        if (ar.exception == null) {

        if (ar.exception == null) {

            polledCalls = (List)ar.result;

            polledCalls = (List)ar.result;

        } else if (isCommandExceptionRadioNotAvailable(ar.exception)) {

        } else if (isCommandExceptionRadioNotAvailable(ar.exception)) {

            // just a dummy empty ArrayList to cause the loop

            // just a placeholder empty ArrayList to cause the loop

            // to hang up all the calls

            // to hang up all the calls

            polledCalls = new ArrayList();

            polledCalls = new ArrayList();

        } else {

        } else {

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -3986,7 +3986,7 @@ public class GsmCdmaPhone extends Phone { 
    @Override

    @Override

    public IccCard getIccCard() {

    public IccCard getIccCard() {

        // This function doesn't return null for backwards compatability purposes.

        // This function doesn't return null for backwards compatability purposes.

        // To differentiate between cases where SIM is absent vs. unknown we return a dummy

        // To differentiate between cases where SIM is absent vs. unknown we return a placeholder

        // IccCard with the sim state set.

        // IccCard with the sim state set.

        IccCard card = getUiccProfile();

        IccCard card = getUiccProfile();

        if (card != null) {

        if (card != null) {

src/java/com/android/internal/telephony/MccTable.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ public final class MccTable { 
        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q,

        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q,

                publicAlternatives = "There is no alternative for {@code MccTable.MccEntry.mIso}, "

                publicAlternatives = "There is no alternative for {@code MccTable.MccEntry.mIso}, "

                        + "but it was included in hidden APIs due to a static analysis false "

                        + "but it was included in hidden APIs due to a static analysis false "

                        + "positive and has been made greylist-max-q. Please file a bug if you "

                        + "positive and has been made max Q. Please file a bug if you "

                        + "still require this API.")

                        + "still require this API.")

        public final String mIso;

        public final String mIso;

        final int mSmallestDigitsMnc;

        final int mSmallestDigitsMnc;
@@ -253,7 +253,7 @@ public final class MccTable { 
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q,

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q,

            publicAlternatives = "There is no alternative for {@code MccTable"

            publicAlternatives = "There is no alternative for {@code MccTable"

                    + ".smallestDigitsMccForMnc}, but it was included in hidden APIs due to a "

                    + ".smallestDigitsMccForMnc}, but it was included in hidden APIs due to a "

                    + "static analysis false positive and has been made greylist-max-q. Please "

                    + "static analysis false positive and has been made max Q. Please "

                    + "file a bug if you still require this API.")

                    + "file a bug if you still require this API.")

    public static int smallestDigitsMccForMnc(int mcc) {

    public static int smallestDigitsMccForMnc(int mcc) {

        MccEntry entry = entryForMcc(mcc);

        MccEntry entry = entryForMcc(mcc);