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

Commit f1af8c52 authored by Matías Hernández's avatar Matías Hernández
Browse files

Settings: don't try to allow NLSes with too-long component names 

* NotificationAccessConfirmationActivity (triggered through CompanionDeviceManager) -> Don't show the dialog, bail out early similarly to other invalid inputs.
* NotificationAccessSettings (from Special App Access) -> No changes, but use the canonical constant now.
* NotificationAccessDetails -> Disable the toggle, unless the NLS was previously approved (in which case it can still be removed).

Fixes: 260570119
Fixes: 286043036
Test: atest + manually
Change-Id: Ifc048311746c027e3683cdcf65f1079d04cf7c56
Merged-In: Ifc048311746c027e3683cdcf65f1079d04cf7c56
parent 173cc267

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

+3 −0
Original line number Diff line number Diff line
@@ -181,7 +181,10 @@ public class NotificationAccessDetails extends AppInfoBase { 


    public void updatePreference(SwitchPreference preference) {

        final CharSequence label = mPackageInfo.applicationInfo.loadLabel(mPm);

        final boolean isAllowedCn = mComponentName.flattenToShortString().length()

                <= NotificationManager.MAX_SERVICE_COMPONENT_NAME_LENGTH;

        preference.setChecked(isServiceEnabled(mComponentName));

        preference.setEnabled(preference.isChecked() || isAllowedCn);

        preference.setOnPreferenceChangeListener((p, newValue) -> {

            final boolean access = (Boolean) newValue;

            if (!access) {

src/com/android/settings/notification/NotificationAccessConfirmationActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -67,7 +67,9 @@ public class NotificationAccessConfirmationActivity extends Activity 
        mUserId = getIntent().getIntExtra(EXTRA_USER_ID, UserHandle.USER_NULL);

        CharSequence mAppLabel;



        if (mComponentName == null || mComponentName.getPackageName() == null) {

        if (mComponentName == null || mComponentName.getPackageName() == null

                || mComponentName.flattenToString().length()

                > NotificationManager.MAX_SERVICE_COMPONENT_NAME_LENGTH) {

            finish();

            return;

        }

src/com/android/settings/notification/NotificationAccessSettings.java

+2 −3
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ import java.util.List; 
public class NotificationAccessSettings extends EmptyTextSettings {

    private static final String TAG = "NotifAccessSettings";



    private static final int MAX_CN_LENGTH = 500;



    private static final ManagedServiceSettings.Config CONFIG =

            new ManagedServiceSettings.Config.Builder()

                    .setTag(TAG)
@@ -135,7 +133,8 @@ public class NotificationAccessSettings extends EmptyTextSettings { 
        for (ServiceInfo service : services) {

            final ComponentName cn = new ComponentName(service.packageName, service.name);

            boolean isAllowed = mNm.isNotificationListenerAccessGranted(cn);

            if (!isAllowed && cn.flattenToString().length() > MAX_CN_LENGTH) {

            if (!isAllowed && cn.flattenToString().length()

                    > NotificationManager.MAX_SERVICE_COMPONENT_NAME_LENGTH) {

                continue;

            }