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

Commit 4f31e832 authored by James Lin's avatar James Lin Committed by Automerger Merge Worker
Browse files

Merge "Fix NullPointerException when convernt the result from Object to... 

Merge "Fix NullPointerException when convernt the result from Object to Boolean" into rvc-dev am: a74134b8 am: f33185d8 am: 94be8311

Change-Id: I08b25643b6c929d5812a04b4a82af86178dacfd6
parents e5c121cf 94be8311

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

+6 −3
Original line number Diff line number Diff line
@@ -190,11 +190,12 @@ public class IccPhoneBookInterfaceManager { 
            if (mAdnCache != null) {

                mAdnCache.updateAdnBySearch(efid, oldAdn, newAdn, pin2, response);

                waitForResult(updateRequest);

                return (boolean) updateRequest.mResult;

            } else {

                loge("Failure while trying to update by search due to uninitialised adncache");

                return false;

            }

        }

        return (boolean) updateRequest.mResult;

    }



    /**
@@ -239,11 +240,12 @@ public class IccPhoneBookInterfaceManager { 
            if (mAdnCache != null) {

                mAdnCache.updateAdnByIndex(efid, newAdn, index, pin2, response);

                waitForResult(updateRequest);

                return (boolean) updateRequest.mResult;

            } else {

                loge("Failure while trying to update by index due to uninitialised adncache");

                return false;

            }

        }

        return (boolean) updateRequest.mResult;

    }



    /**
@@ -301,11 +303,12 @@ public class IccPhoneBookInterfaceManager { 
            if (mAdnCache != null) {

                mAdnCache.requestLoadAllAdnLike(efid, mAdnCache.extensionEfForEf(efid), response);

                waitForResult(loadRequest);

                return (List<AdnRecord>) loadRequest.mResult;

            } else {

                loge("Failure while trying to load from SIM due to uninitialised adncache");

                return null;

            }

        }

        return (List<AdnRecord>) loadRequest.mResult;

    }



    @UnsupportedAppUsage