| commit | 1551fe7ce22adc8bc6f4a625e205a1cfcd1552bf | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Jul 29 17:30:20 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 29 17:30:20 2024 +0000 |
| tree | 12e1723720ba112b38e5b0e61112a7f17030b0bb | |
| parent | dbde7919a5542749d32e62cbb261751af4913764 [diff] | |
| parent | f5424a3451589c8f27f071b0ba5767cec61b2349 [diff] |
Merge "Prevent Sharing when FRP enforcement is in effect" into sc-dev am: f5424a3451 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27899378 Change-Id: I0f23025ba9719c924f3a9dcde3bc22bd8edc0436 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 105f80a..276b653 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -602,6 +602,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.