From 2c47e6f823ba98b8fc59c790a65e8d9632620060 Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Thu, 8 Jan 2015 10:48:47 -0800
Subject: [PATCH] Register USB receiver

This makes USB mode selection work properly, and prevents developer
options from crashing on exit.

Change-Id: I4c822f2694b0d87438827ff0da0d974c93ddbcab
---
 src/com/android/settings/DevelopmentSettings.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index ebbc341b310..dd7f5df030b 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -61,7 +61,9 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.HardwareRenderer;
 import android.view.IWindowManager;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.Switch;
 import android.widget.TextView;
@@ -480,6 +482,15 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
         mSwitchBar.show();
     }
 
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(UsbManager.ACTION_USB_STATE);
+        getActivity().registerReceiver(mUsbReceiver, filter);
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();