diff options
| author | mengsun <msun@codeaurora.org> | 2013-12-28 22:12:22 +0800 |
|---|---|---|
| committer | emancebo <emancebo@cyngn.com> | 2014-09-02 15:42:29 -0700 |
| commit | 46ad643c0bfbd3c7aab670e405ce2a2280539a91 (patch) | |
| tree | f0dc42477349fd356fd164d6fc965bdb532d92b1 /src/com/android | |
| parent | bc89a360292949f1b3deb3d230106eb14e9ec28b (diff) | |
| download | packages_apps_InCallUI-46ad643c0bfbd3c7aab670e405ce2a2280539a91.tar.gz packages_apps_InCallUI-46ad643c0bfbd3c7aab670e405ce2a2280539a91.tar.bz2 packages_apps_InCallUI-46ad643c0bfbd3c7aab670e405ce2a2280539a91.zip | |
Fix NullPointerException in ProximitySensor initialization
Update the sensor status after all vars initialized
Change-Id: I576a15f0db5c3cba82dcca28a72c44a4b75b361f
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/incallui/ProximitySensor.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/incallui/ProximitySensor.java b/src/com/android/incallui/ProximitySensor.java index 8aa62422..01ba1ce2 100644 --- a/src/com/android/incallui/ProximitySensor.java +++ b/src/com/android/incallui/ProximitySensor.java @@ -68,14 +68,13 @@ public class ProximitySensor implements AccelerometerListener.OrientationListene mContext = context; mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); - updateProximitySensorBySetting(); - Log.d(this, "onCreate: mProximityWakeLock: ", mProximityWakeLock); - context.getContentResolver().registerContentObserver(Settings.System.CONTENT_URI, true, - settingsObserver); - mAccelerometerListener = new AccelerometerListener(context, this); mProximityListener = new ProximityListener(context); mAudioModeProvider = audioModeProvider; + context.getContentResolver().registerContentObserver(Settings.System.CONTENT_URI, true, + settingsObserver); + updateProximitySensorBySetting(); + Log.d(this, "onCreate: mProximityWakeLock: ", mProximityWakeLock); mAudioModeProvider.addListener(this); } |