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

Merge "Lazily load bitmap of SubscriptionInfo"

Browse Source
This commit is contained in:
Meng Wang
2021-07-27 18:30:21 +00:00
committed by Gerrit Code Review
parent 4eaa49eeb6 ba8227eb45
commit 4d8663cb84
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
telephony/java/android/telephony/SubscriptionInfo.java
View File

@@ -23,6 +23,7 @@ import android.content.Context;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint; import android.graphics.Paint;
@@ -113,9 +114,9 @@ public class SubscriptionInfo implements Parcelable {
private int mDataRoaming; private int mDataRoaming;
/** /**
* SIM Icon bitmap * SIM icon bitmap cache
*/ */
private Bitmap mIconBitmap; @Nullable private Bitmap mIconBitmap;
/** /**
* Mobile Country Code * Mobile Country Code
@@ -403,6 +404,10 @@ public class SubscriptionInfo implements Parcelable {
* @return A bitmap icon for this {@code SubscriptionInfo}. * @return A bitmap icon for this {@code SubscriptionInfo}.
*/ */
public Bitmap createIconBitmap(Context context) { public Bitmap createIconBitmap(Context context) {
if (mIconBitmap == null) {
mIconBitmap = BitmapFactory.decodeResource(context.getResources(),
com.android.internal.R.drawable.ic_sim_card_multi_24px_clr);
}
int width = mIconBitmap.getWidth(); int width = mIconBitmap.getWidth();
int height = mIconBitmap.getHeight(); int height = mIconBitmap.getHeight();
DisplayMetrics metrics = context.getResources().getDisplayMetrics(); DisplayMetrics metrics = context.getResources().getDisplayMetrics();
@@ -765,7 +770,6 @@ public class SubscriptionInfo implements Parcelable {
String mcc = source.readString(); String mcc = source.readString();
String mnc = source.readString(); String mnc = source.readString();
String countryIso = source.readString(); String countryIso = source.readString();
Bitmap iconBitmap = source.readParcelable(Bitmap.class.getClassLoader());
boolean isEmbedded = source.readBoolean(); boolean isEmbedded = source.readBoolean();
UiccAccessRule[] nativeAccessRules = source.createTypedArray(UiccAccessRule.CREATOR); UiccAccessRule[] nativeAccessRules = source.createTypedArray(UiccAccessRule.CREATOR);
String cardString = source.readString(); String cardString = source.readString();
@@ -784,10 +788,10 @@ public class SubscriptionInfo implements Parcelable {
boolean areUiccApplicationsEnabled = source.readBoolean(); boolean areUiccApplicationsEnabled = source.readBoolean();
SubscriptionInfo info = new SubscriptionInfo(id, iccId, simSlotIndex, displayName, SubscriptionInfo info = new SubscriptionInfo(id, iccId, simSlotIndex, displayName,
carrierName, nameSource, iconTint, number, dataRoaming, iconBitmap, mcc, mnc, carrierName, nameSource, iconTint, number, dataRoaming, /* icon= */ null,
countryIso, isEmbedded, nativeAccessRules, cardString, cardId, isOpportunistic, mcc, mnc, countryIso, isEmbedded, nativeAccessRules, cardString, cardId,
groupUUID, isGroupDisabled, carrierid, profileClass, subType, groupOwner, isOpportunistic, groupUUID, isGroupDisabled, carrierid, profileClass, subType,
carrierConfigAccessRules, areUiccApplicationsEnabled); groupOwner, carrierConfigAccessRules, areUiccApplicationsEnabled);
info.setAssociatedPlmns(ehplmns, hplmns); info.setAssociatedPlmns(ehplmns, hplmns);
return info; return info;
} }
@@ -812,7 +816,7 @@ public class SubscriptionInfo implements Parcelable {
dest.writeString(mMcc); dest.writeString(mMcc);
dest.writeString(mMnc); dest.writeString(mMnc);
dest.writeString(mCountryIso); dest.writeString(mCountryIso);
dest.writeParcelable(mIconBitmap, flags); // Do not write mIconBitmap since it should be lazily loaded on first usage
dest.writeBoolean(mIsEmbedded); dest.writeBoolean(mIsEmbedded);
dest.writeTypedArray(mNativeAccessRules, flags); dest.writeTypedArray(mNativeAccessRules, flags);
dest.writeString(mCardString); dest.writeString(mCardString);