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

Commit 94b419c2 authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Add NPE protection" into main

parents 2d6b8384 f8396a55

core/java/com/android/internal/app/LocalePickerWithRegion.java

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Context; 
import android.os.Bundle;

import android.os.LocaleList;

import android.text.TextUtils;

import android.util.Log;

import android.view.Menu;

import android.view.MenuInflater;

import android.view.MenuItem;
@@ -265,6 +266,11 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O 
    public void onListItemClick(ListView parent, View v, int position, long id) {

        final LocaleStore.LocaleInfo locale =

                (LocaleStore.LocaleInfo) parent.getAdapter().getItem(position);

         if (locale == null) {

            Log.d(TAG, "Can not get the locale.");

            return;

        }



        // Special case for resetting the app locale to equal the system locale.

        boolean isSystemLocale = locale.isSystemLocale();

        boolean isRegionLocale = locale.getParent() != null;