From acae29c84cc3f648e5f3e15a9d8280dbd8b6bf1a Mon Sep 17 00:00:00 2001
From: Jeff Chang <chengjeff@google.com>
Date: Mon, 4 Oct 2021 20:58:16 +0800
Subject: [PATCH] Always set the task auth no matter the relinquished attribute

1d689704009, Skip to set the task auth with relinquished attribute
which result in lock task mode broken. The CL set the lock task
auth no matter if set the relinquished property.

Bug: 199032412
Test: atest LockTaskControllerTest
Change-Id: If7b0b6d0c502f3092d7e44515d1a2f733564a554
---
 services/core/java/com/android/server/wm/Task.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 594b6be489d65..94cb6c7f973b2 100644
--- 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);
     }