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

Commit 89534d07 authored by Alex Johnston's avatar Alex Johnston Committed by Automerger Merge Worker
Browse files

Merge "DISALLOW_USB_FILE_TRANSFER update user restrictions" into sc-dev am:... 

Merge "DISALLOW_USB_FILE_TRANSFER update user restrictions" into sc-dev am: 4d2eee78 am: bbee8f83

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

Change-Id: I3e8fe8ff7c4f153a3a9e2bc3a205e6363fa19081
parents 48671d37 bbee8f83

services/usb/java/com/android/server/usb/UsbService.java

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ public class UsbService extends IUsbManager.Stub { 
        final IntentFilter filter = new IntentFilter();

        filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);

        filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);

        mContext.registerReceiver(receiver, filter, null, null);

        mContext.registerReceiverAsUser(receiver, UserHandle.ALL, filter, null, null);

    }



    /**