summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-07-29 18:29:12 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-07-29 18:29:12 +0000
commitf1e2103d18809ffab41745f5a96453c314fb45db (patch)
treee1056ce9b73beeefd2b3d3be05c7c1f7953d0f9a
parent0a3cca69634f428fa439be5c51757f813bab0435 (diff)
parentdf4e71583338853fbdf25ad2a89f35b4df5d8254 (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: I67b113d1c78ca161a446e87f801e39c045dc816d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/com/android/internal/app/ChooserActivity.java8
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);