Merge "Always set the task auth no matter the relinquished attribute" into sc-v2-dev am: 61d2fce0c1 am: 5fa3acde5a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16004193 Change-Id: I23e5abbee865dc3b12e94a0cb36eab30a894f331
2021-10-18 02:16:27 +00:00
parent 3b023dd2f2 5fa3acde5a
commit 4ad5fe406c
1 changed files with 0 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -994,7 +994,6 @@ class Task extends TaskFragment {
            mCallingPackage = r.launchedFromPackage;
            mCallingFeatureId = r.launchedFromFeatureId;
            setIntent(intent != null ? intent : r.intent, info != null ? info : r.info);
-            return;
        }
        setLockTaskAuth(r);
    }