From ad46ae1bcf958c5dfca487a063019bc669cc56ab Mon Sep 17 00:00:00 2001
From: Shuo Qian <shuoq@google.com>
Date: Wed, 26 Feb 2020 16:13:49 -0800
Subject: [PATCH] API Review Feedbacks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1) Rethrow the remoteException instead of returning empty string
 for CarrierConfigManager#getDefaultCarrierServicePackageName()

2) Flip documentation to use “valid” instead of “invalid” for
 ModemActivityInfo.isValid()

Bug: 147804136
Test: Treehugger; Cts
Change-Id: I595837dfb24a09c68e33a732aa24b5b25ff28ac0
---
 telephony/java/android/telephony/CarrierConfigManager.java | 1 +
 telephony/java/android/telephony/ModemActivityInfo.java    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 1eed0e02f9bd1..fae64585acf44 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -4110,6 +4110,7 @@ public class CarrierConfigManager {
         } catch (RemoteException ex) {
             Rlog.e(TAG, "getDefaultCarrierServicePackageName ICarrierConfigLoader is null"
                     + ex.toString());
+            ex.rethrowAsRuntimeException();
         }
         return "";
     }
diff --git a/telephony/java/android/telephony/ModemActivityInfo.java b/telephony/java/android/telephony/ModemActivityInfo.java
index bd2375f7d2972..6f9240679c72a 100644
--- a/telephony/java/android/telephony/ModemActivityInfo.java
+++ b/telephony/java/android/telephony/ModemActivityInfo.java
@@ -199,7 +199,7 @@ public final class ModemActivityInfo implements Parcelable {
     }
 
     /**
-     * Indicate if the ModemActivityInfo is invalid due to modem's invalid reporting.
+     * Indicates if the modem has reported valid {@link ModemActivityInfo}.
      *
      * @return {@code true} if this {@link ModemActivityInfo} record is valid,
      * {@code false} otherwise.