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

[Safer intents] Settings misc

Browse Source 
To avoid implicit intents, make intents launch explicitly.

Test: build
Bug: 323061508
Change-Id: Ie19cbceb89842a75a180898abcce81b63c18d46c
This commit is contained in:
Jason Chiu
2024-03-25 12:15:56 +08:00
parent 9507bdb3ac
commit 0bd014c497
23 changed files with 54 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/accounts/AccountPreferenceController.java
View File

@@ -256,6 +256,7 @@ public class AccountPreferenceController extends AbstractPreferenceController
if (preference == profileData.addAccountPreference) {
mMetricsFeatureProvider.logClickedPreference(preference, metricsCategory);
Intent intent = new Intent(ACTION_ADD_ACCOUNT);
intent.setClass(mContext, AddAccountSettings.class);
intent.putExtra(EXTRA_USER, profileData.userInfo.getUserHandle());
intent.putExtra(EXTRA_AUTHORITIES, mAuthorities);
mContext.startActivity(intent);

3
src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
View File

@@ -66,7 +66,8 @@ public class EnterpriseDisclosurePreferenceController extends BasePreferenceCont
final FooterPreference footerPreference = screen.findPreference(getPreferenceKey());
footerPreference.setTitle(disclosure);
footerPreference.setLearnMoreAction(view -> {
mContext.startActivity(new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS));
mContext.startActivity(new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS)
.setPackage(mContext.getPackageName()));
});
final String learnMoreText = mContext.getString(
R.string.footer_learn_more_content_description, getLabelName());