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

Commit 8924b61e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disallow launching the Settings activity for unavailable or hidden roles."

parents dea877b6 cce96e11

src/com/android/packageinstaller/role/ui/DefaultAppActivity.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -81,6 +81,11 @@ public class DefaultAppActivity extends FragmentActivity { 
            finish();

            finish();

            return;

            return;

        }

        }

        if (!role.isVisibleAsUser(user, this)) {

            Log.e(LOG_TAG, "Role is invisible: " + roleName);

            finish();

            return;

        }





        if (savedInstanceState == null) {

        if (savedInstanceState == null) {

            DefaultAppFragment fragment = DefaultAppFragment.newInstance(roleName, user);

            DefaultAppFragment fragment = DefaultAppFragment.newInstance(roleName, user);

src/com/android/packageinstaller/role/ui/SpecialAppAccessActivity.java

+10 −0
Original line number Original line Diff line number Diff line
@@ -65,6 +65,16 @@ public class SpecialAppAccessActivity extends FragmentActivity { 
            finish();

            finish();

            return;

            return;

        }

        }

        if (!role.isAvailable(this)) {

            Log.e(LOG_TAG, "Role is unavailable: " + roleName);

            finish();

            return;

        }

        if (!role.isVisible(this)) {

            Log.e(LOG_TAG, "Role is invisible: " + roleName);

            finish();

            return;

        }





        if (savedInstanceState == null) {

        if (savedInstanceState == null) {

            SpecialAppAccessFragment fragment = SpecialAppAccessFragment.newInstance(roleName);

            SpecialAppAccessFragment fragment = SpecialAppAccessFragment.newInstance(roleName);