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

Commit 4eaca597 authored by Jay Shrauner's avatar Jay Shrauner Committed by Android Git Automerger
Browse files

am 3e33d5a7: am 8d51c2f6: Merge "Fix CountryDetector NPE" into klp-dev 

* commit '3e33d5a7':
  Fix CountryDetector NPE
parents 85bb9056 3e33d5a7

telephony/java/com/android/internal/telephony/CallerInfo.java

+4 −0
Original line number Diff line number Diff line
@@ -581,6 +581,10 @@ public class CallerInfo { 
        return countryIso;

    }



    protected static String getCurrentCountryIso(Context context) {

        return getCurrentCountryIso(context, Locale.getDefault());

    }



    /**

     * @return a string debug representation of this instance.

     */

telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java

+1 −4
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.AsyncQueryHandler; 
import android.content.Context;

import android.database.Cursor;

import android.database.SQLException;

import android.location.CountryDetector;

import android.net.Uri;

import android.os.Handler;

import android.os.Looper;
@@ -271,11 +270,9 @@ public class CallerInfoAsyncQuery { 


                    // Use the number entered by the user for display.

                    if (!TextUtils.isEmpty(cw.number)) {

                        CountryDetector detector = (CountryDetector) mQueryContext.getSystemService(

                                Context.COUNTRY_DETECTOR);

                        mCallerInfo.phoneNumber = PhoneNumberUtils.formatNumber(cw.number,

                                mCallerInfo.normalizedNumber,

                                detector.detectCountry().getCountryIso());

                                CallerInfo.getCurrentCountryIso(mQueryContext));

                    }

                }