Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1551fe7c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I0f23025ba9719c924f3a9dcde3bc22bd8edc0436
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dbde7919 f5424a34

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -602,6 +602,14 @@ public class ChooserActivity extends ResolverActivity implements 




    @Override

    @Override

    protected void onCreate(Bundle savedInstanceState) {

    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();

        final long intentReceivedTime = System.currentTimeMillis();

        getChooserActivityLogger().logSharesheetTriggered();

        getChooserActivityLogger().logSharesheetTriggered();

        // This is the only place this value is being set. Effectively final.

        // This is the only place this value is being set. Effectively final.