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

Commit cb18eaf7 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "fix usage of String Array." am: e3da1fb3 

am: 17261243

Change-Id: I7277bbed307e6604f50b361cf08356cbc5ab9ec3
parents 6d1afc40 17261243

src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java

+3 −2
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import java.io.IOException; 
import java.io.InputStream;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.List;

import java.util.zip.GZIPInputStream;
@@ -273,7 +274,7 @@ public class EmergencyNumberTracker extends Handler { 
                if (b != null) {

                    String[] emergencyNumberPrefix = b.getStringArray(

                            CarrierConfigManager.KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY);

                    if (!mEmergencyNumberPrefix.equals(emergencyNumberPrefix)) {

                    if (!Arrays.equals(mEmergencyNumberPrefix, emergencyNumberPrefix)) {

                        this.obtainMessage(EVENT_UPDATE_EMERGENCY_NUMBER_PREFIX,

                                emergencyNumberPrefix).sendToTarget();

                    }
@@ -436,7 +437,7 @@ public class EmergencyNumberTracker extends Handler { 


    private void updateEmergencyNumberPrefixAndNotify(String[] emergencyNumberPrefix) {

        logd("updateEmergencyNumberPrefixAndNotify(): receiving emergencyNumberPrefix: "

                + emergencyNumberPrefix.toString());

                + Arrays.toString(emergencyNumberPrefix));

        mEmergencyNumberPrefix = emergencyNumberPrefix;

        updateEmergencyNumberList();

        if (!DBG) {