Revert "Security fix for VPN app killable via lockscreen." (1b991494) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSFgsManagerFooter.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import androidx.annotation.Nullable;
		import com.android.systemui.R;
		import com.android.systemui.dagger.qualifiers.Background;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.qs.dagger.QSScope;

		import java.util.concurrent.Executor;
		@@ -52,7 +51,6 @@ public class QSFgsManagerFooter implements View.OnClickListener,
		private final Context mContext;
		private final Executor mMainExecutor;
		private final Executor mExecutor;
		private final ActivityStarter mActivityStarter;

		private final FgsManagerController mFgsManagerController;

		@@ -71,8 +69,7 @@ public class QSFgsManagerFooter implements View.OnClickListener,
		@Inject
		QSFgsManagerFooter(@Named(QS_FGS_MANAGER_FOOTER_VIEW) View rootView,
		@Main Executor mainExecutor, @Background Executor executor,
		FgsManagerController fgsManagerController,
		ActivityStarter activityStarter) {
		FgsManagerController fgsManagerController) {
		mRootView = rootView;
		mFooterText = mRootView.findViewById(R.id.footer_text);
		mTextContainer = mRootView.findViewById(R.id.fgs_text_container);
		@@ -84,7 +81,6 @@ public class QSFgsManagerFooter implements View.OnClickListener,
		mMainExecutor = mainExecutor;
		mExecutor = executor;
		mFgsManagerController = fgsManagerController;
		mActivityStarter = activityStarter;
		}

		/**
		@@ -132,14 +128,7 @@ public class QSFgsManagerFooter implements View.OnClickListener,

		@Override
		public void onClick(View view) {
		mActivityStarter.dismissKeyguardThenExecute(
		() -> {
		mFgsManagerController.showDialog(mRootView);
		return false /* if the dismiss should be deferred */;
		},
		null /* cancelAction */,
		true /* afterKeyguardGone */
		);
		}

		public void refreshState() {