Merge "Always set the task auth no matter the relinquished attribute" into sc-v2-dev

2021-10-18 02:01:22 +00:00
parent cb3244a6d7 acae29c84c
commit 61d2fce0c1
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
@@ -1001,7 +1001,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);
    }