PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Improve logging to support issue triage" into udc-dev

Browse Source
This commit is contained in:
Bonian Chen
2023-03-01 03:59:03 +00:00
committed by Android (Google) Code Review
parent 510cb8f22e 62e934a039
commit 6113725b61
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/network/MobileNetworkRepository.java
View File

@@ -125,7 +125,8 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
mContext = context; mContext = context;
mMobileNetworkDatabase = MobileNetworkDatabase.getInstance(context); mMobileNetworkDatabase = MobileNetworkDatabase.getInstance(context);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider(); mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_MOBILE_NETWORK_DB_CREATED); mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_MOBILE_NETWORK_DB_CREATED,
subId);
mSubscriptionManager = context.getSystemService(SubscriptionManager.class); mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
mCallback = mobileNetworkCallback; mCallback = mobileNetworkCallback;
mSubscriptionInfoDao = mMobileNetworkDatabase.mSubscriptionInfoDao(); mSubscriptionInfoDao = mMobileNetworkDatabase.mSubscriptionInfoDao();
@@ -327,7 +328,8 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
} }
} }
mMetricsFeatureProvider.action(mContext, mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_MOBILE_NETWORK_DB_GET_UICC_INFO); SettingsEnums.ACTION_MOBILE_NETWORK_DB_GET_UICC_INFO,
subInfo.getSubscriptionId());
} }
private void onAvailableSubInfoChanged( private void onAvailableSubInfoChanged(
@@ -343,7 +345,7 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
} }
mCallback.onAvailableSubInfoChanged(availableSubInfoEntityList); mCallback.onAvailableSubInfoChanged(availableSubInfoEntityList);
mMetricsFeatureProvider.action(mContext, mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_MOBILE_NETWORK_DB_NOTIFY_SUB_INFO_IS_CHANGED); SettingsEnums.ACTION_MOBILE_NETWORK_DB_NOTIFY_SUB_INFO_IS_CHANGED, 0);
setActiveSubInfoList(mActiveSubInfoEntityList); setActiveSubInfoList(mActiveSubInfoEntityList);
} }
@@ -359,7 +361,7 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
mUiccInfoEntityList = uiccInfoEntityList; mUiccInfoEntityList = uiccInfoEntityList;
mCallback.onAllUiccInfoChanged(uiccInfoEntityList); mCallback.onAllUiccInfoChanged(uiccInfoEntityList);
mMetricsFeatureProvider.action(mContext, mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_MOBILE_NETWORK_DB_NOTIFY_UICC_INFO_IS_CHANGED); SettingsEnums.ACTION_MOBILE_NETWORK_DB_NOTIFY_UICC_INFO_IS_CHANGED, 0);
} }
private void onAllMobileNetworkInfoChanged( private void onAllMobileNetworkInfoChanged(
@@ -367,7 +369,7 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
mMobileNetworkInfoEntityList = mobileNetworkInfoEntityList; mMobileNetworkInfoEntityList = mobileNetworkInfoEntityList;
mCallback.onAllMobileNetworkInfoChanged(mobileNetworkInfoEntityList); mCallback.onAllMobileNetworkInfoChanged(mobileNetworkInfoEntityList);
mMetricsFeatureProvider.action(mContext, mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_MOBILE_NETWORK_DB_NOTIFY_MOBILE_NETWORK_INFO_IS_CHANGED); SettingsEnums.ACTION_MOBILE_NETWORK_DB_NOTIFY_MOBILE_NETWORK_INFO_IS_CHANGED, 0);
} }
public void insertSubInfo(Context context, SubscriptionInfo info) { public void insertSubInfo(Context context, SubscriptionInfo info) {
@@ -388,7 +390,7 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
insertUiccInfo(subId); insertUiccInfo(subId);
insertMobileNetworkInfo(context, subId); insertMobileNetworkInfo(context, subId);
mMetricsFeatureProvider.action(mContext, mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_MOBILE_NETWORK_DB_INSERT_SUB_INFO); SettingsEnums.ACTION_MOBILE_NETWORK_DB_INSERT_SUB_INFO, mSubId);
} else if (DEBUG) { } else if (DEBUG) {
Log.d(TAG, "Can not insert subInfo, the entity is null"); Log.d(TAG, "Can not insert subInfo, the entity is null");
} }
@@ -414,7 +416,7 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
sCacheUiccInfoEntityMap.remove(subId); sCacheUiccInfoEntityMap.remove(subId);
sCacheMobileNetworkInfoEntityMap.remove(subId); sCacheMobileNetworkInfoEntityMap.remove(subId);
mMetricsFeatureProvider.action(mContext, mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_MOBILE_NETWORK_DB_DELETE_DATA); SettingsEnums.ACTION_MOBILE_NETWORK_DB_DELETE_DATA, id);
} }
public SubscriptionInfoEntity convertToSubscriptionInfoEntity(Context context, public SubscriptionInfoEntity convertToSubscriptionInfoEntity(Context context,
@@ -477,7 +479,8 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
sCacheUiccInfoEntityMap.put(subId, uiccInfoEntity); sCacheUiccInfoEntityMap.put(subId, uiccInfoEntity);
mMobileNetworkDatabase.insertUiccInfo(uiccInfoEntity); mMobileNetworkDatabase.insertUiccInfo(uiccInfoEntity);
mMetricsFeatureProvider.action(mContext, mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_MOBILE_NETWORK_DB_INSERT_UICC_INFO); SettingsEnums.ACTION_MOBILE_NETWORK_DB_INSERT_UICC_INFO,
Integer.parseInt(subId));
} }
} }
@@ -491,7 +494,8 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
sCacheMobileNetworkInfoEntityMap.put(subId, mobileNetworkInfoEntity); sCacheMobileNetworkInfoEntityMap.put(subId, mobileNetworkInfoEntity);
mMobileNetworkDatabase.insertMobileNetworkInfo(mobileNetworkInfoEntity); mMobileNetworkDatabase.insertMobileNetworkInfo(mobileNetworkInfoEntity);
mMetricsFeatureProvider.action(mContext, mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_MOBILE_NETWORK_DB_INSERT_MOBILE_NETWORK_INFO); SettingsEnums.ACTION_MOBILE_NETWORK_DB_INSERT_MOBILE_NETWORK_INFO,
Integer.parseInt(subId));
} }
} }