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

Commit 80c72515 authored by Fan Zhang's avatar Fan Zhang
Browse files

Switch to use EmergencyNumberUtils to update e-number. 

The backend storage choice is delegated to EmergencyNumberUtils. Using
the utils class abstrats underlying details away from Settings app.

Bug: 177006940
Test: manual
Change-Id: I78c5ef79e141e3609ab9d10e558803457b617911
parent 6f74b9a5

src/com/android/settings/gestures/EmergencyGestureNumberOverridePreference.java

+2 −5
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.content.DialogInterface.BUTTON_POSITIVE; 


import android.content.Context;

import android.content.DialogInterface;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.view.View;
@@ -91,11 +90,9 @@ public class EmergencyGestureNumberOverridePreference extends 
        if (which == BUTTON_POSITIVE) {

            final String input = mEditText.getText().toString();

            if (!TextUtils.isEmpty(input)) {

                Settings.Secure.putString(getContext().getContentResolver(),

                        Settings.Secure.EMERGENCY_GESTURE_CALL_NUMBER, input);

                mEmergencyNumberUtils.setEmergencyNumberOverride(input);

            } else {

                Settings.Secure.putString(getContext().getContentResolver(),

                        Settings.Secure.EMERGENCY_GESTURE_CALL_NUMBER,

                mEmergencyNumberUtils.setEmergencyNumberOverride(

                        mEmergencyNumberUtils.getDefaultPoliceNumber());

            }

        }

src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java

+4 −3
Original line number Diff line number Diff line
@@ -16,11 +16,12 @@ 


package com.android.settings.gestures;



import static com.android.settingslib.emergencynumber.EmergencyNumberUtils.EMERGENCY_NUMBER_OVERRIDE_AUTHORITY;



import android.content.Context;

import android.database.ContentObserver;

import android.os.Handler;

import android.os.Looper;

import android.provider.Settings;

import android.telephony.PhoneNumberUtils;

import android.text.Spannable;
@@ -86,8 +87,8 @@ public class EmergencyGestureNumberOverridePreferenceController extends BasePref 


    @Override

    public void onStart() {

        mContext.getContentResolver().registerContentObserver(Settings.Secure.getUriFor(

                Settings.Secure.EMERGENCY_GESTURE_CALL_NUMBER), false, mSettingsObserver);

        mContext.getContentResolver().registerContentObserver(EMERGENCY_NUMBER_OVERRIDE_AUTHORITY,

                false, mSettingsObserver);

    }



    @Override