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

Commit d1349217 authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

Merge \\"Bump ACTION_CHOOSE_PRIVATE_KEY_ALIAS broadcast to foreground\\" into... 

Merge \\"Bump ACTION_CHOOSE_PRIVATE_KEY_ALIAS broadcast to foreground\\" into nyc-mr1-dev am: f627e9c0
am: 2a149106

Change-Id: I30bad0f21b35f98db769a92ea81be7be50b86186
parents 9c9dc40a 2a149106

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -4427,6 +4427,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_URI, uri);

        intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_URI, uri);

        intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_ALIAS, alias);

        intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_ALIAS, alias);

        intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_RESPONSE, response);

        intent.putExtra(DeviceAdminReceiver.EXTRA_CHOOSE_PRIVATE_KEY_RESPONSE, response);

        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);





        final long id = mInjector.binderClearCallingIdentity();

        final long id = mInjector.binderClearCallingIdentity();

        try {

        try {