From 4a109b1d8790736bc5cca0d7f95d8b2abced6b59 Mon Sep 17 00:00:00 2001
From: Yasuhiro Matsuda <mazda@google.com>
Date: Wed, 22 Jul 2015 21:36:23 +0900
Subject: [PATCH] Handle the case where USB_STATE intent is not received yet.

Call updateUsbConfigurationValues() when ACTION_USB_STATE intent
is not yet received so that mUsbConfiguration value is properly
initialized in this case.

BUG: 22163689
Change-Id: I2aeed43fc49e40c52cdc2bfc08d43081815b49d1
---
 src/com/android/settings/DevelopmentSettings.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index dbf55a9e7bf..2bd6b9252bc 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -552,7 +552,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);
     }