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

Commit 25a519fa authored by Shishir Agrawal's avatar Shishir Agrawal Committed by Android (Google) Code Review
Browse files

Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev

parents 99ae0785 279a2676

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

+2 −2
Original line number Diff line number Diff line
@@ -1834,9 +1834,9 @@ public interface Phone { 
    int getVoicePhoneServiceState();



    /**

     * Override the service provider name and the operator name for the input ICCID.

     * Override the service provider name and the operator name for the current ICCID.

     */

    public boolean setOperatorBrandOverride(String iccId, String brand);

    public boolean setOperatorBrandOverride(String brand);



    /**

     * Is Radio Present on the device and is it accessible

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

+1 −1
Original line number Diff line number Diff line
@@ -1911,7 +1911,7 @@ public abstract class PhoneBase extends Handler implements Phone { 
    }



    @Override

    public boolean setOperatorBrandOverride(String iccId, String brand) {

    public boolean setOperatorBrandOverride(String brand) {

        return false;

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -1379,8 +1379,8 @@ public class PhoneProxy extends Handler implements Phone { 
    }



    @Override

    public boolean setOperatorBrandOverride(String iccId, String brand) {

        return mActivePhone.setOperatorBrandOverride(iccId, brand);

    public boolean setOperatorBrandOverride(String brand) {

        return mActivePhone.setOperatorBrandOverride(brand);

    }



    @Override

src/java/com/android/internal/telephony/cdma/CDMAPhone.java

+2 −2
Original line number Diff line number Diff line
@@ -1768,7 +1768,7 @@ public class CDMAPhone extends PhoneBase { 
    }



    @Override

    public boolean setOperatorBrandOverride(String iccId, String brand) {

    public boolean setOperatorBrandOverride(String brand) {

        if (mUiccController == null) {

            return false;

        }
@@ -1778,7 +1778,7 @@ public class CDMAPhone extends PhoneBase { 
            return false;

        }



        boolean status = card.setOperatorBrandOverride(iccId, brand);

        boolean status = card.setOperatorBrandOverride(brand);



        // Refresh.

        if (status) {

src/java/com/android/internal/telephony/gsm/GSMPhone.java

+2 −2
Original line number Diff line number Diff line
@@ -1763,7 +1763,7 @@ public class GSMPhone extends PhoneBase { 
    }



    @Override

    public boolean setOperatorBrandOverride(String iccId, String brand) {

    public boolean setOperatorBrandOverride(String brand) {

        if (mUiccController == null) {

            return false;

        }
@@ -1773,7 +1773,7 @@ public class GSMPhone extends PhoneBase { 
            return false;

        }



        boolean status = card.setOperatorBrandOverride(iccId, brand);

        boolean status = card.setOperatorBrandOverride(brand);



        // Refresh.

        if (status) {