diff options
| author | 2024-07-08 14:27:37 -0400 | |
|---|---|---|
| committer | 2024-07-09 17:05:23 -0400 | |
| commit | 94d1e1e4e9539437ec0549b7bf22999054b92f1f (patch) | |
| tree | ad86984844d108fcc999eab33554b816ba70243f /java/src | |
| parent | dd10bf5818019d58b19f735bfb5c1091d057b8f6 (diff) | |
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
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/intentresolver/ChooserActivity.java | 7 |
1 files changed, 7 insertions, 0 deletions
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); |