diff options
| author | 2024-07-29 18:29:15 +0000 | |
|---|---|---|
| committer | 2024-07-29 18:29:15 +0000 | |
| commit | fe8bcb7eab20ea7f87f962b68be7472ef3afbec8 (patch) | |
| tree | 6cf92e356b4bfb56213f975c6e4b6dafefdcd5e7 | |
| parent | a29ababe54a64cc9f9bd5355ca4ae877dfade700 (diff) | |
| parent | df4e71583338853fbdf25ad2a89f35b4df5d8254 (diff) | |
Merge "Prevent Sharing when FRP enforcement is in effect" into sc-dev am: f5424a3451 am: 1551fe7ce2 am: 1d562fcead am: df4e715833
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27899378
Change-Id: I8c2e63492c9e95f07245114be96afebdfaf7bbd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/com/android/internal/app/ChooserActivity.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 25ba36cc3240..919c176b5841 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -515,6 +515,14 @@ public class ChooserActivity extends ResolverActivity implements @Override protected void onCreate(Bundle savedInstanceState) { + if (Settings.Secure.getIntForUser(getContentResolver(), + Settings.Secure.SECURE_FRP_MODE, 0, + getUserId()) == 1) { + Log.e(TAG, "Sharing disabled due to active FRP lock."); + super.onCreate(savedInstanceState); + finish(); + return; + } final long intentReceivedTime = System.currentTimeMillis(); mLatencyTracker.onActionStart(ACTION_LOAD_SHARE_SHEET); |