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

Merge "Close Settings page when cross-profile appop is granted" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-18 03:25:24 +00:00
committed by Android (Google) Code Review
parent df9f721033 d3fa045e35
commit 1b240b646d
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
View File

@@ -120,18 +120,10 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
if (!mCrossProfileApps.canConfigureInteractAcrossProfiles(mPackageName)) { if (!mCrossProfileApps.canConfigureInteractAcrossProfiles(mPackageName)) {
logNonConfigurableAppMetrics(); logNonConfigurableAppMetrics();
} }
Bundle bundle = getIntent().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGS); if (launchedByApp()) {
if (bundle == null) {
logEvent(DevicePolicyEnums.CROSS_PROFILE_SETTINGS_PAGE_LAUNCHED_FROM_SETTINGS);
return;
}
Intent intent = (Intent) bundle.get(INTENT_KEY);
if (intent == null) {
logEvent(DevicePolicyEnums.CROSS_PROFILE_SETTINGS_PAGE_LAUNCHED_FROM_SETTINGS);
return;
}
if (ACTION_MANAGE_CROSS_PROFILE_ACCESS.equals(intent.getAction())) {
logEvent(DevicePolicyEnums.CROSS_PROFILE_SETTINGS_PAGE_LAUNCHED_FROM_APP); logEvent(DevicePolicyEnums.CROSS_PROFILE_SETTINGS_PAGE_LAUNCHED_FROM_APP);
} else {
logEvent(DevicePolicyEnums.CROSS_PROFILE_SETTINGS_PAGE_LAUNCHED_FROM_SETTINGS);
} }
} }
@@ -270,6 +262,9 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
logEvent(DevicePolicyEnums.CROSS_PROFILE_SETTINGS_PAGE_USER_CONSENTED); logEvent(DevicePolicyEnums.CROSS_PROFILE_SETTINGS_PAGE_USER_CONSENTED);
enableInteractAcrossProfiles(true); enableInteractAcrossProfiles(true);
refreshUi(); refreshUi();
if (launchedByApp()) {
setIntentAndFinish(/* appChanged= */ true);
}
} }
}) })
.setNegativeButton(R.string.deny, new DialogInterface.OnClickListener() { .setNegativeButton(R.string.deny, new DialogInterface.OnClickListener() {
@@ -464,4 +459,16 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
public int getMetricsCategory() { public int getMetricsCategory() {
return SettingsEnums.INTERACT_ACROSS_PROFILES; return SettingsEnums.INTERACT_ACROSS_PROFILES;
} }
private boolean launchedByApp() {
final Bundle bundle = getIntent().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGS);
if (bundle == null) {
return false;
}
final Intent intent = (Intent) bundle.get(INTENT_KEY);
if (intent == null) {
return false;
}
return ACTION_MANAGE_CROSS_PROFILE_ACCESS.equals(intent.getAction());
}
} }