commit 1aff9c726a73c79fb01c9bc35af83f198605bd59
author Julia Reynolds <juliacr@google.com> Fri Sep 24 13:58:07 2021 -0400
committer Julia Reynolds <juliacr@google.com> Fri Sep 24 18:05:27 2021 +0000
tree ffd5bd5ad389885cdf9d2f76ff50a6c9962e18da
parent 7e253fafe99a663fb81431100d1b798cfd3494a2

Always return the same result code in access screens

Regardless if the target package exists or not.

Test: Launch dnd and NLS screen with valid and invalid
packages; ensure the result code is the same for both
Bug: 195412179

Change-Id: I1bacd54c2971afb3733ca2f1462bcaabaada300b

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

diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
index 9e03657..da25f17 100644
--- a/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
@@ -173,7 +173,7 @@
                 getActivity(), UserManager.DISALLOW_APPS_CONTROL, mUserId);
 
         if (!refreshUi()) {
-            setIntentAndFinish(true /* appChanged */);
+            finish();
         }
         Preference apps = getPreferenceScreen().findPreference(
                 use(BridgedAppsLinkPreferenceController.class).getPreferenceKey());
@@ -197,14 +197,6 @@
         }
     }
 
-    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 @@
                             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

diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java
index c608b5b..0a326c6 100644
--- a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java
+++ b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java
@@ -53,10 +53,11 @@
         // 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;
     }