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

Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7 am: 984e74a32e am: 5d95b855dc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: I147a3065c4b214508b325c02e95da68ad22fec0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-24 10:57:12 +00:00
committed by Automerger Merge Worker
parent f2a63608ba 5d95b855dc
commit eff730475e
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
View File

@@ -97,7 +97,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
@Override
public CharSequence getSummary() {
return getSummary(0);
return mContext.getString(R.string.device_info_protected_single_press);
}
private CharSequence getSummary(int simSlot) {
@@ -114,6 +114,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
}
ImeiInfoDialogFragment.show(mFragment, simSlot, preference.getTitle().toString());
preference.setSummary(getSummary(simSlot));
return true;
}
@@ -130,7 +131,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
private void updatePreference(Preference preference, int simSlot) {
preference.setTitle(getTitle(simSlot));
preference.setSummary(getSummary(simSlot));
preference.setSummary(getSummary());
}
private CharSequence getTitleForGsmPhone(int simSlot) {