Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e21284e8 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ib1df91f97e9dd60cf13871db1eef62e4180d7e95
parents 1b275d9c 1aff9c72

src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java

+2 −10
Original line number Diff line number Diff line
@@ -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

        }

    }

src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java

+4 −3
Original line number Diff line number Diff line
@@ -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();

        }

        return true;

    }