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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16004193

Change-Id: I76c981b2cce471206eddac4ee7608ca50ff7f429
This commit is contained in:
TreeHugger Robot
2021-10-18 02:12:02 +00:00
committed by Automerger Merge Worker

View File

@@ -1001,7 +1001,6 @@ class Task extends TaskFragment {
mCallingPackage = r.launchedFromPackage; mCallingPackage = r.launchedFromPackage;
mCallingFeatureId = r.launchedFromFeatureId; mCallingFeatureId = r.launchedFromFeatureId;
setIntent(intent != null ? intent : r.intent, info != null ? info : r.info); setIntent(intent != null ? intent : r.intent, info != null ? info : r.info);
return;
} }
setLockTaskAuth(r); setLockTaskAuth(r);
} }