Merge "[Settings] Present EID in About phone page" (d308b891) · Commits · e / os / android_packages_apps_Settings

res/layout/dialog_eid_status.xml

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2022 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:padding="@dimen/sim_content_padding">

		<TextView
		style="@style/device_info_dialog_value"
		android:id="@+id/esim_id_value"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textIsSelectable="true"
		android:text="@string/device_info_not_available"/>

		<ImageView
		android:id="@+id/esim_id_qrcode"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		tools:ignore="ContentDescription" />

		</LinearLayout>

res/values/strings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -2415,6 +2415,10 @@
		<string name="storage_settings_for_app" >Storage & cache</string>
		<!-- Storage settings screen title -->
		<string name="storage_settings_title">Storage settings</string>
		<!-- About phone, title of EID -->
		<string name="status_eid">EID</string>
		<!-- About phone, title of EID for multi-sim devices -->
		<string name="eid_multi_sim">EID (sim slot %1$d)</string>
		<!-- About phone screen, title for IMEI for multi-sim devices -->
		<string name="imei_multi_sim">IMEI (sim slot %1$d)</string>
		<!-- About phone screen, summary of the MAC address [CHAR LIMIT=80] -->

res/xml/my_device_info.xml

+13 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@
		<!-- Model & hardware -->
		<Preference
		android:key="device_model"
		android:order="31"
		android:order="30"
		android:title="@string/model_info"
		android:summary="@string/summary_placeholder"
		android:fragment="com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFragment"
		@@ -113,6 +113,18 @@
		settings:keywords="@string/keywords_model_and_hardware"
		settings:controller="com.android.settings.deviceinfo.HardwareInfoPreferenceController"/>

		<!-- EID -->
		<com.android.settings.network.telephony.TelephonyPreferenceDialog
		android:key="eid_info"
		android:order="31"
		android:title="@string/status_eid"
		android:summary="@string/device_info_protected_single_press"
		android:positiveButtonText="@string/dlg_ok"
		android:dialogLayout="@layout/dialog_eid_status"
		settings:isPreferenceVisible="@bool/config_show_sim_info"
		settings:enableCopying="true"
		settings:controller="com.android.settings.deviceinfo.simstatus.SimEidPreferenceController"/>

		<!-- IMEI -->
		<com.android.settings.deviceinfo.PhoneNumberSummaryPreference
		android:key="imei_info"

src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,8 @@ import com.android.settings.deviceinfo.SafetyInfoPreferenceController;
		import com.android.settings.deviceinfo.UptimePreferenceController;
		import com.android.settings.deviceinfo.WifiMacAddressPreferenceController;
		import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController;
		import com.android.settings.deviceinfo.simstatus.EidStatus;
		import com.android.settings.deviceinfo.simstatus.SimEidPreferenceController;
		import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceController;
		import com.android.settings.deviceinfo.simstatus.SlotSimStatus;
		import com.android.settings.search.BaseSearchIndexProvider;
		@@ -59,6 +61,7 @@ public class MyDeviceInfoFragment extends DashboardFragment
		implements DeviceNamePreferenceController.DeviceNamePreferenceHost {

		private static final String LOG_TAG = "MyDeviceInfoFragment";
		private static final String KEY_EID_INFO = "eid_info";
		private static final String KEY_MY_DEVICE_INFO_HEADER = "my_device_info_header";

		private BuildNumberPreferenceController mBuildNumberPreferenceController;
		@@ -130,6 +133,12 @@ public class MyDeviceInfoFragment extends DashboardFragment
		slotRecord.init(fragment, slotSimStatus);
		controllers.add(slotRecord);
		}

		EidStatus eidStatus = new EidStatus(slotSimStatus, context, executor);
		SimEidPreferenceController simEid = new SimEidPreferenceController(context, KEY_EID_INFO);
		simEid.init(slotSimStatus, eidStatus);
		controllers.add(simEid);

		if (executor != null) {
		executor.shutdown();
		}

src/com/android/settings/deviceinfo/simstatus/EidStatus.java

0 → 100644

+151 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.deviceinfo.simstatus;

		import android.content.Context;
		import android.telephony.SubscriptionInfo;
		import android.telephony.TelephonyManager;
		import android.telephony.UiccCardInfo;
		import android.telephony.euicc.EuiccManager;
		import android.text.TextUtils;
		import java.util.Arrays;
		import java.util.List;
		import java.util.Objects;
		import java.util.concurrent.Executor;
		import java.util.concurrent.Phaser;
		import java.util.concurrent.atomic.AtomicReference;
		import java.util.stream.IntStream;

		/**
		* A class for query EID.
		*/
		public class EidStatus {

		private static final String TAG = "EidStatus";
		private final SlotSimStatus mSlotSimStatus;
		private final Phaser mBlocker = new Phaser(1);
		private final AtomicReference<String> mEid = new AtomicReference<String>();

		/**
		* Construct of class.
		* @param slotSimStatus SlotSimStatus
		* @param context Context
		*/
		public EidStatus(SlotSimStatus slotSimStatus, Context context) {
		this(slotSimStatus, context, null);
		}

		/**
		* Construct of class.
		* @param slotSimStatus SlotSimStatus
		* @param context Context
		* @param executor executor for offload to thread
		*/
		public EidStatus(SlotSimStatus slotSimStatus, Context context, Executor executor) {
		mSlotSimStatus = slotSimStatus;

		if (executor == null) {
		getEidOperation(context);
		} else {
		executor.execute(() -> getEidOperation(context));
		}
		}

		/**
		* Get the EID
		* @return EID string
		*/
		public String getEid() {
		mBlocker.awaitAdvance(0);
		return mEid.get();
		}

		protected TelephonyManager getTelephonyManager(Context context) {
		return context.getSystemService(TelephonyManager.class);
		}

		protected EuiccManager getEuiccManager(Context context) {
		return context.getSystemService(EuiccManager.class);
		}

		protected String getDefaultEid(EuiccManager euiccMgr) {
		if ((euiccMgr == null) \|\| (!euiccMgr.isEnabled())) {
		return null;
		}
		return euiccMgr.getEid();
		}

		protected void getEidOperation(Context context) {
		EuiccManager euiccMgr = getEuiccManager(context);
		String eid = getEidPerSlot(context, euiccMgr);
		if (eid == null) {
		eid = getDefaultEid(euiccMgr);
		}
		mEid.set(eid);
		mBlocker.arrive();
		}

		protected String getEidPerSlot(Context context, EuiccManager euiccMgr) {
		if (mSlotSimStatus.size() <= SimStatusDialogController.MAX_PHONE_COUNT_SINGLE_SIM) {
		return null;
		}

		TelephonyManager telMgr = getTelephonyManager(context);
		if (telMgr == null) {
		return null;
		}

		List<UiccCardInfo> uiccCardInfoList = telMgr.getUiccCardsInfo();
		if (uiccCardInfoList == null) {
		return null;
		}

		// Collects all card ID from all eSIM(s) reported from SubscsriptionManager
		final int [] cardIdList = IntStream.range(0, mSlotSimStatus.size())
		.mapToObj(slotIdx -> mSlotSimStatus.getSubscriptionInfo(slotIdx))
		.filter(Objects::nonNull)
		.filter(SubscriptionInfo::isEmbedded)
		.mapToInt(SubscriptionInfo::getCardId)
		.sorted()
		.distinct()
		.toArray();
		if (cardIdList.length == 0) {
		return null;
		}

		/**
		* Find EID from first slot which contains an eSIM and with card ID listed within
		* the eSIM card ID provided by SubscsriptionManager.
		*/
		return uiccCardInfoList.stream()
		.filter(UiccCardInfo::isEuicc)
		.filter(cardInfo -> {
		int cardId = cardInfo.getCardId();
		return Arrays.binarySearch(cardIdList, cardId) >= 0;
		})
		.map(cardInfo -> {
		String eid = cardInfo.getEid();
		if (TextUtils.isEmpty(eid)) {
		eid = euiccMgr.createForCardId(cardInfo.getCardId()).getEid();
		}
		return eid;
		})
		.findFirst()
		.orElse(null);
		}

		}