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

Always return the same result code in access screens am: 1aff9c726a am: e21284e8d9

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

Change-Id: I264b8cb65037681c6e48f5435e5da6a590207dc3
This commit is contained in:
Julia Reynolds
2021-09-24 19:49:33 +00:00
committed by Automerger Merge Worker
parent 4d4867a662 e21284e8d9
commit eba8afd3e6
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
View File

@@ -173,7 +173,7 @@ public class NotificationAccessDetails extends DashboardFragment {
getActivity(), UserManager.DISALLOW_APPS_CONTROL, mUserId);
if (!refreshUi()) {
setIntentAndFinish(true /* appChanged */);
finish();
}
Preference apps = getPreferenceScreen().findPreference(
use(BridgedAppsLinkPreferenceController.class).getPreferenceKey());
@@ -197,14 +197,6 @@ public class NotificationAccessDetails extends DashboardFragment {
}
}
protected void setIntentAndFinish(boolean appChanged) {
Log.i(TAG, "appChanged=" + appChanged);
Intent intent = new Intent();
intent.putExtra(ManageApplications.APP_CHG, appChanged);
SettingsActivity sa = (SettingsActivity) getActivity();
sa.finishPreferencePanel(Activity.RESULT_OK, intent);
}
protected void retrieveAppEntry() {
final Bundle args = getArguments();
mPackageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;
@@ -228,7 +220,7 @@ public class NotificationAccessDetails extends DashboardFragment {
PackageManager.GET_SIGNING_CERTIFICATES |
PackageManager.GET_PERMISSIONS, mUserId);
} catch (PackageManager.NameNotFoundException e) {
Log.e(TAG, "Exception when retrieving package:" + mPackageName, e);
// oh well
}
}

7
src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java
View File

@@ -53,10 +53,11 @@ public class ZenAccessDetails extends AppInfoWithHeader implements
// If this app didn't declare this permission in their manifest, don't bother showing UI.
final Set<String> needAccessApps =
ZenAccessController.getPackagesRequestingNotificationPolicyAccess();
if (!needAccessApps.contains(mPackageName)) {
return false;
if (needAccessApps.contains(mPackageName)) {
updatePreference(context, findPreference(SWITCH_PREF_KEY));
} else {
finish();
}
updatePreference(context, findPreference(SWITCH_PREF_KEY));
return true;
}