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

Commit ae351ec1 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android Git Automerger
Browse files

am b2690f38: Merge "Fail silently if a process trys to launch an acitvity for... 

am b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev

* commit 'b2690f38':
  Fail silently if a process trys to launch an acitvity for background user
parents bbb17765 b2690f38

core/java/android/app/Instrumentation.java

+8 −3
Original line number Diff line number Diff line
@@ -1810,9 +1810,14 @@ public class Instrumentation { 
                throw new SecurityException(

                        "Starting under voice control not allowed for: " + intent);

            case ActivityManager.START_NOT_CURRENT_USER_ACTIVITY:

                throw new SecurityException(

                        "Not allowed to start background user activity that shouldn't be"

                        + " displayed for all users.");

                // Fail silently for this case so we don't break current apps.

                // TODO(b/22929608): Instead of failing silently or throwing an exception,

                // we should properly position the activity in the stack (i.e. behind all current

                // user activity/task) and not change the positioning of stacks.

                Log.e(TAG,

                        "Not allowed to start background user activity that shouldn't be displayed"

                        + " for all users. Failing silently...");

                break;

            default:

                throw new AndroidRuntimeException("Unknown error code "

                        + res + " when starting " + intent);