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

Commit 9aa3c3ce 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:... 

Merge "Prevent Sharing when FRP enforcement is in effect" into sc-dev am: f5424a34 am: 1551fe7c am: 1d562fce am: df4e7158 am: fe8bcb7e

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



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

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

+8 −0
Original line number Diff line number Diff line
@@ -542,6 +542,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);