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"

Browse Source
This commit is contained in:
Treehugger Robot
2022-09-24 08:23:53 +00:00
committed by Gerrit Code Review
parent 8a9dc9ca90 ed95f35423
commit 4d5951c6ef
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -29,6 +29,8 @@
<!-- Device Info screen. Used for a status item's value when the proper value is not known --> <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
<string name="device_info_default">Unknown</string> <string name="device_info_default">Unknown</string>
<!-- String for removal of sensitive info on about, depending on tap -->
<string name="device_info_protected_single_press">Tap to show info</string>
<!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings --> <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
<plurals name="show_dev_countdown"> <plurals name="show_dev_countdown">
<item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from being a developer.</item> <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from being a developer.</item>

1
res/xml/my_device_info.xml
View File

@@ -57,7 +57,6 @@
android:order="3" android:order="3"
android:title="@string/status_number" android:title="@string/status_number"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:selectable="false"
settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController" settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController"
settings:enableCopying="true"/> settings:enableCopying="true"/>
</PreferenceCategory> </PreferenceCategory>

22
src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
View File

@@ -56,7 +56,24 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
return getFirstPhoneNumber(); return mContext.getString(R.string.device_info_protected_single_press);
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
String prefKey = preference.getKey();
if (prefKey.startsWith(KEY_PHONE_NUMBER)) {
int simSlotNumber = 0;
if (!TextUtils.equals(prefKey, KEY_PHONE_NUMBER)) {
// Get multisim slot number from preference key.
// Multisim preference key is KEY_PHONE_NUMBER + simSlotNumber
simSlotNumber = Integer.parseInt(
prefKey.replaceAll("[^0-9]", ""));
}
final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);
simStatusPreference.setSummary(getPhoneNumber(simSlotNumber));
}
return super.handlePreferenceTreeClick(preference);
} }
@Override @Override
@@ -73,7 +90,6 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
final Preference multiSimPreference = createNewPreference(screen.getContext()); final Preference multiSimPreference = createNewPreference(screen.getContext());
multiSimPreference.setOrder(phonePreferenceOrder + simSlotNumber); multiSimPreference.setOrder(phonePreferenceOrder + simSlotNumber);
multiSimPreference.setKey(KEY_PHONE_NUMBER + simSlotNumber); multiSimPreference.setKey(KEY_PHONE_NUMBER + simSlotNumber);
multiSimPreference.setSelectable(false);
category.addPreference(multiSimPreference); category.addPreference(multiSimPreference);
mPreferenceList.add(multiSimPreference); mPreferenceList.add(multiSimPreference);
} }
@@ -84,7 +100,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
for (int simSlotNumber = 0; simSlotNumber < mPreferenceList.size(); simSlotNumber++) { for (int simSlotNumber = 0; simSlotNumber < mPreferenceList.size(); simSlotNumber++) {
final Preference simStatusPreference = mPreferenceList.get(simSlotNumber); final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);
simStatusPreference.setTitle(getPreferenceTitle(simSlotNumber)); simStatusPreference.setTitle(getPreferenceTitle(simSlotNumber));
simStatusPreference.setSummary(getPhoneNumber(simSlotNumber)); simStatusPreference.setSummary(getSummary());
} }
} }

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

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