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

Commit df4e7158 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

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



Change-Id: If7ba7339b4de8512563927d8bda3c18a50f96b7a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0fed3c74 1d562fce

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

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