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

Commit a68bbaff authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "profcollect: Fix NPE when invoking UsbManager" into main am: a3027e70 

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



Change-Id: I18ab0f4525f52e5b82c805fc00f2e1ca4c7cbaa5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b7c7423f a3027e70

services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java

+4 −0
Original line number Diff line number Diff line
@@ -144,6 +144,10 @@ public final class ProfcollectForwardingService extends SystemService { 
    public void onBootPhase(int phase) {

        if (phase == PHASE_SYSTEM_SERVICES_READY) {

            UsbManager usbManager = getContext().getSystemService(UsbManager.class);

            if (usbManager == null) {

                mAdbActive = false;

                return;

            }

            mAdbActive = ((usbManager.getCurrentFunctions() & UsbManager.FUNCTION_ADB) == 1);

            Log.d(LOG_TAG, "ADB is " + mAdbActive + " on system startup");

        }