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

Commit 0394486e authored by Ajay Nambi's avatar Ajay Nambi Committed by android-build-merger
Browse files

Merge "Uicc: Fix NullPointerException issue after turn on airplane mode" am: 625a1765 

am: a5b403d0

Change-Id: I8faba3cb7ec11efeb3d10875eda7718eefe3891d
parents 1bebc7bc a5b403d0

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

100755 → 100644
+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ public class IccProvider extends ContentProvider { 
            String param = tokens[n];

            if (DBG) log("parsing '" + param + "'");



            String[] pair = param.split("=");

            String[] pair = param.split("=", 2);



            if (pair.length != 2) {

                Rlog.e(TAG, "resolve: bad whereClause parameter: " + param);

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

+6 −2
Original line number Diff line number Diff line
@@ -359,8 +359,12 @@ public class AdnRecordCache extends Handler implements IccConstants { 
                Message response = mUserWriteResponse.get(efid);

                mUserWriteResponse.delete(efid);



                // response may be cleared when simrecord is reset,

                // so we should check if it is null.

                if (response != null) {

                    AsyncResult.forMessage(response, null, ar.exception);

                    response.sendToTarget();

                }

                break;

        }

    }