commit df4e71583338853fbdf25ad2a89f35b4df5d8254
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 29 18:11:14 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 29 18:11:14 2024 +0000
tree e572c426e4f4deaa9c42d3aa9f98bf10e1b33efe
parent 0fed3c74101b7c50761d7a63c5fd4ee9a909be8b
parent 1d562fcead65e9b78adbc5eb9e9abe8154322b1b

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

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

Change-Id: If7ba7339b4de8512563927d8bda3c18a50f96b7a
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 25ba36cc..919c176 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -515,6 +515,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();
         mLatencyTracker.onActionStart(ACTION_LOAD_SHARE_SHEET);