Merge "New System Api: getGroupIdLevel2" into main (6801f23c) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -16271,6 +16271,7 @@ package android.telephony {
		method @FlaggedApi("android.permission.flags.get_emergency_role_holder_api_enabled") @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getEmergencyAssistancePackageName();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion();
		method @FlaggedApi("com.android.internal.telephony.flags.get_group_id_level2") @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getGroupIdLevel2();
		method @FlaggedApi("com.android.internal.telephony.flags.support_isim_record") @NonNull @RequiresPermission(value=android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, conditional=true) public java.util.List<java.lang.String> getImsPcscfAddresses();
		method @FlaggedApi("com.android.internal.telephony.flags.support_isim_record") @Nullable @RequiresPermission(android.Manifest.permission.USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER) public String getImsPrivateUserIdentity();
		method @FlaggedApi("com.android.internal.telephony.flags.support_isim_record") @NonNull @RequiresPermission(value=android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, conditional=true) public java.util.List<android.net.Uri> getImsPublicUserIdentities();

+30 −0

Original line number	Diff line number	Diff line
		@@ -5250,6 +5250,36 @@ public class TelephonyManager {
		}
		}

		/**
		* Returns the Group Identifier Level 2 in hexadecimal format.
		* @return the Group Identifier Level 2 for the SIM card.
		* Return null if it is unavailable.
		*
		* @throws UnsupportedOperationException If the device does not have
		* {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_GET_GROUP_ID_LEVEL2)
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)
		@SystemApi
		@Nullable
		public String getGroupIdLevel2() {
		try {
		IPhoneSubInfo info = getSubscriberInfoService();
		if (info == null) {
		return null;
		}
		return info.getGroupIdLevel2ForSubscriber(getSubId(), mContext.getOpPackageName(),
		mContext.getAttributionTag());
		} catch (RemoteException ex) {
		return null;
		} catch (NullPointerException ex) {
		// This could happen before phone restarts due to crashing
		return null;
		}
		}

		/**
		* Returns the phone number string for line 1, for example, the MSISDN
		* for a GSM phone for a particular subscription. Return null if it is unavailable.

+6 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,12 @@ interface IPhoneSubInfo {
		String getGroupIdLevel1ForSubscriber(int subId, String callingPackage,
		String callingFeatureId);

		/**
		* Retrieves the Group Identifier Level1 for GSM phones of a subId.
		*/
		String getGroupIdLevel2ForSubscriber(int subId, String callingPackage,
		String callingFeatureId);

		/** @deprecared Use {@link getIccSerialNumberWithFeature(String, String)} instead */
		@UnsupportedAppUsage
		String getIccSerialNumber(String callingPackage);