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

Commit 6bad7044 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge changes I09ecc525,I83e7e8ef 

* changes:
  Revert "Do not use lambda as it breaks javac"
  Add missing dependency to services for desugaring
parents 94c15f43 03196cdf

services/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := $(addprefix services.,$(services)) \ 
    android.hidl.base-V1.0-java-static \

    android.hardware.biometrics.fingerprint-V2.1-java-static



LOCAL_JAVA_LIBRARIES := \

    android.hidl.manager-V1.0-java



ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true)

LOCAL_EMMA_INSTRUMENT := true

endif

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

+1 −6
Original line number Diff line number Diff line
@@ -692,12 +692,7 @@ public class UsbPortManager { 


        // Guard against possible reentrance by posting the broadcast from the handler

        // instead of from within the critical section.

        mHandler.post(new Runnable() {

            @Override

            public void run() {

                mContext.sendBroadcastAsUser(intent, UserHandle.ALL);

            }

        });

        mHandler.post(() -> mContext.sendBroadcastAsUser(intent, UserHandle.ALL));

    }



    private static void logAndPrint(int priority, IndentingPrintWriter pw, String msg) {