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

Commit 85f01476 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Cleanup hsum_unlock_notification_fix" into main

parents 7d0d5d08 1a9d8917

core/java/android/app/admin/flags/flags.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -155,16 +155,6 @@ flag { 
  bug: "295324350"

}



flag {

  name: "hsum_unlock_notification_fix"

  namespace: "enterprise"

  description: "Using the right userId when starting the work profile unlock flow "

  bug: "327350831"

  metadata {

      purpose: PURPOSE_BUGFIX

  }

}



flag {

    name: "allow_querying_profile_type"

    is_exported: true

services/core/java/com/android/server/locksettings/LockSettingsService.java

+3 −9
Original line number Diff line number Diff line
@@ -756,15 +756,9 @@ public class LockSettingsService extends ILockSettings.Stub { 


        unlockIntent.setFlags(

                Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

        PendingIntent intent;

        if (android.app.admin.flags.Flags.hsumUnlockNotificationFix()) {

            intent = PendingIntent.getActivityAsUser(mContext, 0, unlockIntent,

        PendingIntent intent = PendingIntent.getActivityAsUser(mContext, 0, unlockIntent,

                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED,

                null, parent);

        } else {

            intent = PendingIntent.getActivity(mContext, 0, unlockIntent,

                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED);

        }



        Slogf.d(TAG, "Showing encryption notification for user %d; reason: %s",

                user.getIdentifier(), reason);