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

This commit is contained in:
TreeHugger Robot
2021-10-18 02:01:22 +00:00
committed by Android (Google) Code Review

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);
} }