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

Commit 3fb1fc3d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prefer `Byte.valueOf()` to `new Byte()`" am: 317694a8 am: f3a00fa3... 

Merge "Prefer `Byte.valueOf()` to `new Byte()`" am: 317694a8 am: f3a00fa3 am: d631dc15 am: e4f7cca2 am: 1495c0af

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2216402



Change-Id: Iaf961d56e2fa4b362605dddd0206a5343be0ef24
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 67257e8d 1495c0af

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

+2 −2
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ public class RadioSimProxy extends RadioServiceProxy { 
                halImsiInfo.base.expirationTime = imsiEncryptionInfo.getExpirationTime().getTime();

            }

            for (byte b : imsiEncryptionInfo.getPublicKey().getEncoded()) {

                halImsiInfo.base.carrierKey.add(new Byte(b));

                halImsiInfo.base.carrierKey.add(Byte.valueOf(b));

            }

            halImsiInfo.keyType = (byte) imsiEncryptionInfo.getKeyType();
@@ -592,7 +592,7 @@ public class RadioSimProxy extends RadioServiceProxy { 
                halImsiInfo.expirationTime = imsiEncryptionInfo.getExpirationTime().getTime();

            }

            for (byte b : imsiEncryptionInfo.getPublicKey().getEncoded()) {

                halImsiInfo.carrierKey.add(new Byte(b));

                halImsiInfo.carrierKey.add(Byte.valueOf(b));

            }



            ((android.hardware.radio.V1_1.IRadio) mRadioProxy).setCarrierInfoForImsiEncryption(