Merge "Handle the case where USB_STATE intent is not received yet."

src/com/android/settings/DevelopmentSettings.java

@@ -547,7 +547,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
             Bundle savedInstanceState) {
         IntentFilter filter = new IntentFilter();
         filter.addAction(UsbManager.ACTION_USB_STATE);
-        getActivity().registerReceiver(mUsbReceiver, filter);
+        if (getActivity().registerReceiver(mUsbReceiver, filter) == null) {
+            updateUsbConfigurationValues();
+        }
         return super.onCreateView(inflater, container, savedInstanceState);
     }