Merge "profcollect: Fix NPE when invoking UsbManager" into main (a3027e70) · Commits · e / os / android_frameworks_base

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");
		}