From 48b9a1e818d6b546dab6ec541d1afa2e0e558560 Mon Sep 17 00:00:00 2001
From: sqian <shuoq@google.com>
Date: Fri, 12 Apr 2019 16:35:13 -0700
Subject: Fix Emergency Number API doc

1) remove documentation about null return
2) Map including the key*s* as the active subscription ID*s*

Bug: 130426238
Test: Treehugger
Change-Id: I4c9b682ef25378b9de91cd6255ed6fc514ea220d
Merged-In: I4c9b682ef25378b9de91cd6255ed6fc514ea220d
(cherry picked from commit aca6eb7dac0a307756d0c3e76b26503618f40df5)
---
 telephony/java/android/telephony/TelephonyManager.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 12acf9d09830..e1425b975525 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -10321,10 +10321,10 @@ public class TelephonyManager {
      * <p>Requires permission {@link android.Manifest.permission#READ_PHONE_STATE} or the calling
      * app has carrier privileges (see {@link #hasCarrierPrivileges}).
      *
-     * @return Map including the key as the active subscription ID (Note: if there is no active
+     * @return Map including the keys as the active subscription IDs (Note: if there is no active
      * subscription, the key is {@link SubscriptionManager#getDefaultSubscriptionId}) and the value
-     * as the list of {@link EmergencyNumber}; null if this information is not available; or throw
-     * a SecurityException if the caller does not have the permission.
+     * as the list of {@link EmergencyNumber}; empty Map if this information is not available;
+     * or throw a SecurityException if the caller does not have the permission.
      */
     @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
     @NonNull
@@ -10374,10 +10374,10 @@ public class TelephonyManager {
      * <li>{@link EmergencyNumber#EMERGENCY_SERVICE_CATEGORY_MIEC} </li>
      * <li>{@link EmergencyNumber#EMERGENCY_SERVICE_CATEGORY_AIEC} </li>
      * </ol>
-     * @return Map including the key as the active subscription ID (Note: if there is no active
+     * @return Map including the keys as the active subscription IDs (Note: if there is no active
      * subscription, the key is {@link SubscriptionManager#getDefaultSubscriptionId}) and the value
-     * as the list of {@link EmergencyNumber}; null if this information is not available; or throw
-     * a SecurityException if the caller does not have the permission.
+     * as the list of {@link EmergencyNumber}; empty Map if this information is not available;
+     * or throw a SecurityException if the caller does not have the permission.
      */
     @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
     @NonNull
-- 
cgit v1.2.3-59-g8ed1b