From 7832ce8f6215d576922a0aa07c140ea81aabbbcb Mon Sep 17 00:00:00 2001 From: Shi Lu Date: Tue, 1 Jun 2021 19:54:08 +0000 Subject: [PATCH] Fixing breaking API change: TelephonyManager#getManualNetworkSelectionPlmn revert to empty string and follow the api docs Bug: 155455467 Test: Manual Change-Id: Idd0955836bf7e8f2655bd4a3f216f66d4459bb4f --- telephony/java/android/telephony/TelephonyManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 5e3b044487a33..0f32e5dd097f7 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -8512,13 +8512,13 @@ public class TelephonyManager { /** * Get the PLMN chosen for Manual Network Selection if active. - * Return null string if in automatic selection. + * Return empty string if in automatic selection. * *

Requires Permission: {@link android.Manifest.permission#READ_PRECISE_PHONE_STATE * READ_PRECISE_PHONE_STATE} or that the calling app has carrier privileges * (see {@link #hasCarrierPrivileges}) * - * @return manually selected network info on success or null string on failure + * @return manually selected network info on success or empty string on failure */ @SuppressAutoDoc // No support carrier privileges (b/72967236). @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) @@ -8531,7 +8531,7 @@ public class TelephonyManager { } catch (RemoteException ex) { Rlog.e(TAG, "getManualNetworkSelectionPlmn RemoteException", ex); } - return null; + return ""; } /**