From 94d1e1e4e9539437ec0549b7bf22999054b92f1f Mon Sep 17 00:00:00 2001 From: Mark Renouf Date: Mon, 8 Jul 2024 14:27:37 -0400 Subject: Prevent Sharing when FRP enforcement is in effect ADB command to trigger sharing: ``` adb shell 'am start -a android.intent.action.CHOOSER --eu android.intent.extra.INTENT "intent:#Intent;action=android.intent.action.SEND;type=text/plain;S.android.intent.extra.TEXT=Shared%20text;end"' ``` Bug: 327645387 Test: Manually, trigger FRP, use adb to trigger sharing Flag: EXEMPT bugfix Change-Id: I4116ecbd3534b0391a5b468ed4cd18f2d4b3ae0a Merged-In: I928b6ea68aa8d6d710dc51eb70acd2cc2ec682c3 --- java/src/com/android/intentresolver/ChooserActivity.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'java/src') diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java index 63ac6435..a206e8ad 100644 --- a/java/src/com/android/intentresolver/ChooserActivity.java +++ b/java/src/com/android/intentresolver/ChooserActivity.java @@ -57,6 +57,7 @@ import android.os.SystemClock; import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; +import android.provider.Settings; import android.service.chooser.ChooserTarget; import android.util.Log; import android.util.Slog; @@ -229,6 +230,12 @@ public class ChooserActivity extends ResolverActivity implements @Override protected void onCreate(Bundle savedInstanceState) { + if (Settings.Global.getInt(getContentResolver(), Settings.Global.SECURE_FRP_MODE, 0) == 1) { + Log.e(TAG, "Sharing disabled due to active FRP lock."); + super.onCreate(savedInstanceState); + finish(); + return; + } Tracer.INSTANCE.markLaunched(); final long intentReceivedTime = System.currentTimeMillis(); mLatencyTracker.onActionStart(ACTION_LOAD_SHARE_SHEET); -- cgit v1.2.3-59-g8ed1b