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

Commit 0b50e56c authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #21753257: Stability: startActivity asks to run as user 0..." into mnc-dev

parents 58e706d7 a825c084

services/core/java/com/android/server/am/ActivityManagerService.java

+14 −8
Original line number Diff line number Diff line
@@ -10779,6 +10779,9 @@ public final class ActivityManagerService extends ActivityManagerNative 
                return;

            }

        }













        long ident = Binder.clearCallingIdentity();













        try {















            pae.intent.replaceExtras(pae.extras);















            pae.intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK















                    | Intent.FLAG_ACTIVITY_SINGLE_TOP









@@ -10789,6 +10792,9 @@ public final class ActivityManagerService extends ActivityManagerNative













            } catch (ActivityNotFoundException e) {















                Slog.w(TAG, "No activity to handle assist action.", e);















            }













        } finally {













            Binder.restoreCallingIdentity(ident);













        }















    }





























    public boolean launchAssistIntent(Intent intent, int requestType, String hint, int userHandle,