commit 1d562fcead65e9b78adbc5eb9e9abe8154322b1b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 29 17:51:48 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 29 17:51:48 2024 +0000
tree 10695b4076e3a358c3af46098d41fb78ff338a2f
parent 3cf4c7dc8fdd90670355239b224667877e81331a
parent 1551fe7ce22adc8bc6f4a625e205a1cfcd1552bf

Merge "Prevent Sharing when FRP enforcement is in effect" into sc-dev am: f5424a3451 am: 1551fe7ce2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27899378

Change-Id: I3c7d7c83eb0218e09436e5e122649e4f163f4e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/com/android/internal/app/ChooserActivity.java

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index a204dc0..2fa16ff 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -600,6 +600,14 @@
 
     @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();
         getChooserActivityLogger().logSharesheetTriggered();
         // This is the only place this value is being set. Effectively final.