Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "API Review Feedbacks" am: 3d2b3a114b am: 25693b816a

Browse Source 
Change-Id: I4854155fb0c5cd85239afa2b3ff695fd6d9603ee
This commit is contained in:
Automerger Merge Worker
2020-02-29 00:59:46 +00:00
parent 82973fd578 25693b816a
commit 3f7ff13f0e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -4367,6 +4367,7 @@ public class CarrierConfigManager {
} catch (RemoteException ex) { } catch (RemoteException ex) {
Rlog.e(TAG, "getDefaultCarrierServicePackageName ICarrierConfigLoader is null" Rlog.e(TAG, "getDefaultCarrierServicePackageName ICarrierConfigLoader is null"
+ ex.toString()); + ex.toString());
ex.rethrowAsRuntimeException();
} }
return ""; return "";
} }

2
telephony/java/android/telephony/ModemActivityInfo.java
View File

@@ -201,7 +201,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, * @return {@code true} if this {@link ModemActivityInfo} record is valid,
* {@code false} otherwise. * {@code false} otherwise.