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

Commit 7444a9e9 authored by Jeff Davidson's avatar Jeff Davidson
Browse files

Fix minor issues in UiccCarrierPrivilegeRules. 

Cleans up incorrect indentation/line lengths and resolves compiler
warnings around unnecessary boxing and identical catch blocks.

Test: Will verify with TreeHugger
Change-Id: I00b7abe6b9cf3bfcb9bd0936a1bba0b273ec9a40
parent bd57f801

src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java

+83 −90
Original line number Diff line number Diff line
@@ -31,20 +31,11 @@ import android.telephony.TelephonyManager; 
import android.text.TextUtils;



import com.android.internal.telephony.CommandException;

import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.uicc.IccUtils;



import java.io.ByteArrayInputStream;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.lang.IllegalArgumentException;

import java.lang.IndexOutOfBoundsException;

import java.security.MessageDigest;

import java.security.NoSuchAlgorithmException;

import java.security.cert.Certificate;

import java.security.cert.CertificateException;

import java.security.cert.CertificateFactory;

import java.security.cert.X509Certificate;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;
@@ -426,14 +417,15 @@ public class UiccCarrierPrivilegeRules extends Handler { 
                ar = (AsyncResult) msg.obj;

                if (ar.exception == null && ar.result != null) {

                    mChannelId = ((int[]) ar.result)[0];

                  mUiccCard.iccTransmitApduLogicalChannel(mChannelId, CLA, COMMAND, P1, P2, P3, DATA,

                      obtainMessage(EVENT_TRANSMIT_LOGICAL_CHANNEL_DONE, new Integer(mChannelId)));

                    mUiccCard.iccTransmitApduLogicalChannel(mChannelId, CLA, COMMAND, P1, P2, P3,

                            DATA, obtainMessage(EVENT_TRANSMIT_LOGICAL_CHANNEL_DONE,

                                    mChannelId));

                } else {

                    // MISSING_RESOURCE could be due to logical channels temporarily unavailable,

                    // so we retry up to MAX_RETRY times, with an interval of RETRY_INTERVAL_MS.

                  if (ar.exception instanceof CommandException && mRetryCount < MAX_RETRY &&

                      ((CommandException) (ar.exception)).getCommandError() ==

                              CommandException.Error.MISSING_RESOURCE) {

                    if (ar.exception instanceof CommandException && mRetryCount < MAX_RETRY

                            && ((CommandException) (ar.exception)).getCommandError()

                                    == CommandException.Error.MISSING_RESOURCE) {

                        mRetryCount++;

                        removeCallbacks(mRetryRunnable);

                        postDelayed(mRetryRunnable, RETRY_INTERVAL_MS);
@@ -452,26 +444,27 @@ public class UiccCarrierPrivilegeRules extends Handler { 
                ar = (AsyncResult) msg.obj;

                if (ar.exception == null && ar.result != null) {

                    IccIoResult response = (IccIoResult) ar.result;

                  if (response.sw1 == 0x90 && response.sw2 == 0x00 &&

                      response.payload != null && response.payload.length > 0) {

                    if (response.sw1 == 0x90 && response.sw2 == 0x00

                            && response.payload != null && response.payload.length > 0) {

                        try {

                          mRules += IccUtils.bytesToHexString(response.payload).toUpperCase(Locale.US);

                            mRules += IccUtils.bytesToHexString(response.payload)

                                    .toUpperCase(Locale.US);

                            if (isDataComplete()) {

                                mAccessRules = parseRules(mRules);

                                updateState(STATE_LOADED, "Success!");

                            } else {

                              mUiccCard.iccTransmitApduLogicalChannel(mChannelId, CLA, COMMAND, P1, P2_EXTENDED_DATA, P3, DATA,

                                  obtainMessage(EVENT_TRANSMIT_LOGICAL_CHANNEL_DONE, new Integer(mChannelId)));

                                mUiccCard.iccTransmitApduLogicalChannel(mChannelId, CLA, COMMAND,

                                        P1, P2_EXTENDED_DATA, P3, DATA,

                                        obtainMessage(EVENT_TRANSMIT_LOGICAL_CHANNEL_DONE,

                                                mChannelId));

                                break;

                            }

                      } catch (IllegalArgumentException ex) {

                          updateState(STATE_ERROR, "Error parsing rules: " + ex);

                      } catch (IndexOutOfBoundsException ex) {

                        } catch (IllegalArgumentException | IndexOutOfBoundsException ex) {

                            updateState(STATE_ERROR, "Error parsing rules: " + ex);

                        }

                    } else {

                      String errorMsg = "Invalid response: payload=" + response.payload +

                              " sw1=" + response.sw1 + " sw2=" + response.sw2;

                        String errorMsg = "Invalid response: payload=" + response.payload

                                + " sw1=" + response.sw1 + " sw2=" + response.sw2;

                        updateState(STATE_ERROR, errorMsg);

                    }

                } else {