Merge "Update TelephonyManager#getNai docs for new device ID requirements" (5e2a0a33) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -45162,7 +45162,7 @@ package android.telephony {
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getMeid(int);
		method public String getMmsUAProfUrl();
		method public String getMmsUserAgent();
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getNai();
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getNai();
		method public String getNetworkCountryIso();
		method public String getNetworkOperator();
		method public String getNetworkOperatorName();

telephony/java/android/telephony/TelephonyManager.java

+31 −4

Original line number	Diff line number	Diff line
		@@ -1769,11 +1769,23 @@ public class TelephonyManager {
		/**
		* Returns the Network Access Identifier (NAI). Return null if NAI is not available.
		*
		* <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
		* or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).
		* <p>Requires Permission: READ_PRIVILEGED_PHONE_STATE, for the calling app to be the device or
		* profile owner and have the READ_PHONE_STATE permission, or that the calling app has carrier
		* privileges (see {@link #hasCarrierPrivileges}). The profile owner is an app that owns a
		* managed profile on the device; for more details see <a
		* href="https://developer.android.com/work/managed-profiles">Work profiles</a>. Profile owner
		* access is deprecated and will be removed in a future release.
		*
		* <ul>
		* <li>If the calling app's target SDK is API level 28 or lower and the app has the
		* READ_PHONE_STATE permission then null is returned.</li>
		* <li>If the calling app's target SDK is API level 28 or lower and the app does not have
		* the READ_PHONE_STATE permission, or if the calling app is targeting API level 29 or
		* higher, then a SecurityException is thrown.</li>
		* </ul>
		*/
		@SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges
		@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
		@SuppressAutoDoc // No support for device / profile owner or carrier privileges (b/72967236).
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public String getNai() {
		return getNaiBySubscriberId(getSubId());
		}
		@@ -1781,6 +1793,21 @@ public class TelephonyManager {
		/**
		* Returns the NAI. Return null if NAI is not available.
		*
		* <p>Requires Permission: READ_PRIVILEGED_PHONE_STATE, for the calling app to be the device or
		* profile owner and have the READ_PHONE_STATE permission, or that the calling app has carrier
		* privileges (see {@link #hasCarrierPrivileges}). The profile owner is an app that owns a
		* managed profile on the device; for more details see <a
		* href="https://developer.android.com/work/managed-profiles">Work profiles</a>. Profile owner
		* access is deprecated and will be removed in a future release.
		*
		* <ul>
		* <li>If the calling app's target SDK is API level 28 or lower and the app has the
		* READ_PHONE_STATE permission then null is returned.</li>
		* <li>If the calling app's target SDK is API level 28 or lower and the app does not have
		* the READ_PHONE_STATE permission, or if the calling app is targeting API level 29 or
		* higher, then a SecurityException is thrown.</li>
		* </ul>
		*
		* @param slotIndex of which Nai is returned
		*/
		/** {@hide}*/