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

Commit b15fc9bd authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "Notify OTA Emergency Number Database Installation complete"

parents dfd04292 f019b212

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8236,6 +8236,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void toggleRadioOnOff();

    method public void updateServiceLocation();

    field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final String ACTION_ANOMALY_REPORTED = "android.telephony.action.ANOMALY_REPORTED";

    field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final String ACTION_OTA_EMERGENCY_NUMBER_DB_INSTALLED = "android.telephony.action.OTA_EMERGENCY_NUMBER_DB_INSTALLED";

    field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";

    field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";

    field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED";

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -497,6 +497,7 @@ 
    <protected-broadcast android:name="android.telephony.action.CARRIER_CONFIG_CHANGED" />

    <protected-broadcast android:name="android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED" />

    <protected-broadcast android:name="android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED" />

    <protected-broadcast android:name="android.telephony.action.OTA_EMERGENCY_NUMBER_DB_INSTALLED" />

    <protected-broadcast android:name="android.telephony.action.SECRET_CODE" />

    <protected-broadcast android:name="android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION" />

    <protected-broadcast android:name="android.telephony.action.SUBSCRIPTION_PLANS_CHANGED" />

services/core/java/com/android/server/updates/EmergencyNumberDbInstallReceiver.java

+7 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.updates; 


import android.content.Context;

import android.content.Intent;

import android.telephony.TelephonyManager;

import android.util.Slog;



/**
@@ -34,6 +35,11 @@ public class EmergencyNumberDbInstallReceiver extends ConfigUpdateInstallReceive 
    @Override

    protected void postInstall(Context context, Intent intent) {

        Slog.i(TAG, "Emergency number database is updated in file partition");

        // TODO Send a notification to EmergencyNumberTracker for updating of emergency number db.



        // Notify EmergencyNumberTracker for emergency number installation complete.

        Intent notifyInstallComplete = new Intent(

                TelephonyManager.ACTION_OTA_EMERGENCY_NUMBER_DB_INSTALLED);

        context.sendBroadcast(

                notifyInstallComplete, android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE);

    }

}

telephony/java/android/telephony/TelephonyManager.java

+10 −0
Original line number Diff line number Diff line
@@ -10837,6 +10837,16 @@ public class TelephonyManager { 
        }

    }



    /**

     * Broadcast intent action for Ota emergency number database installation complete.

     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @SystemApi

    public static final String ACTION_OTA_EMERGENCY_NUMBER_DB_INSTALLED =

            "android.telephony.action.OTA_EMERGENCY_NUMBER_DB_INSTALLED";



    /**

     * Returns whether {@link TelephonyManager#ACTION_EMERGENCY_ASSISTANCE emergency assistance} is

     * available on the device.