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

Commit dbb49383 authored by Adnan Begovic's avatar Adnan Begovic
Browse files

Settings: Fix SecuritySettings filtering. 

  Recent changes to SecuritySettings to appease
  CTSVerifier expectations broke filtration for
  the lockscreen intent (would always default as
  external type). This patch also addresses the
  "Installed Blocked" settings intent filter
  not including the unknown sources checkbox.

Change-Id: If6ef7a3913ad90f4d018b26f6c3166fe47d2865a
TICKET: CYNGNOS-2171
(cherry picked from commit ab4baeed)
parent a711321d

src/com/android/settings/SecuritySettings.java

+13 −6
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ public class SecuritySettings extends SettingsPreferenceFragment 


        Bundle extras = getActivity().getIntent().getExtras();

        // Even uglier hack to make cts verifier expectations make sense.

        if (extras.get(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS) != null) {

        if (extras.get(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS) != null &&

                extras.get(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SHORTCUT) == null) {

            mFilterType = TYPE_EXTERNAL_RESOLUTION;

        }
@@ -266,7 +267,12 @@ public class SecuritySettings extends SettingsPreferenceFragment 
            root.addPreference(mLockscreenDisabledPreference);

        }



        if (mFilterType == TYPE_LOCKSCREEN_EXTRA || mFilterType == TYPE_EXTERNAL_RESOLUTION) {

        final boolean securityOrExternal = mFilterType == TYPE_SECURITY_EXTRA

                || mFilterType == TYPE_EXTERNAL_RESOLUTION;

        final boolean lockscreenOrExternal = mFilterType == TYPE_SECURITY_EXTRA

                || mFilterType == TYPE_EXTERNAL_RESOLUTION;



        if (lockscreenOrExternal) {

            // Add options for lock/unlock screen

            final int resid = getResIdForLockUnlockScreen(getActivity(), mLockPatternUtils);

            addPreferencesFromResource(resid);
@@ -283,8 +289,7 @@ public class SecuritySettings extends SettingsPreferenceFragment 
            }

        }



        if (mIsPrimary && mFilterType == TYPE_SECURITY_EXTRA

                || mFilterType == TYPE_EXTERNAL_RESOLUTION) {

        if (mIsPrimary && securityOrExternal) {

            if (LockPatternUtils.isDeviceEncryptionEnabled()) {

                // The device is currently encrypted.

                addPreferencesFromResource(R.xml.security_settings_encrypted);
@@ -294,7 +299,7 @@ public class SecuritySettings extends SettingsPreferenceFragment 
            }

        }



        if (mFilterType == TYPE_LOCKSCREEN_EXTRA || mFilterType == TYPE_EXTERNAL_RESOLUTION) {

        if (lockscreenOrExternal) {

            // Fingerprint and trust agents

            PreferenceGroup securityCategory = (PreferenceGroup)

                    root.findPreference(KEY_SECURITY_CATEGORY);
@@ -339,7 +344,9 @@ public class SecuritySettings extends SettingsPreferenceFragment 
                liveLockPreference.setSummary(R.string.live_lock_screen_summary);

                generalCategory.addPreference(liveLockPreference);

            }

        } else {

        }



        if (securityOrExternal) {

            // Append the rest of the settings

            addPreferencesFromResource(R.xml.security_settings_misc);