From a62dc2266449adc677ddc7c8141e615f95e3652c Mon Sep 17 00:00:00 2001 From: Rekha Kumar Date: Wed, 17 Jun 2015 13:15:25 -0700 Subject: IMS-VT: Fix null pointer exception mOrientationEventListener is replaced by mInCallOrientationEventListener. Removed some usage left out as part of merge conflict/change propagation. Bug: 21893478 Change-Id: I7b9d9e804745df199da9562f4d05e533dd4999c2 --- InCallUI/src/com/android/incallui/InCallActivity.java | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'InCallUI') diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index 3dc2c9daf..714db0977 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -142,11 +142,6 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD } }; - /** - * Listener for orientation changes. - */ - private OrientationEventListener mOrientationEventListener; - @Override protected void onCreate(Bundle icicle) { Log.d(this, "onCreate()... this = " + this); @@ -235,14 +230,6 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD Log.d(this, "onStart()..."); super.onStart(); - if (mOrientationEventListener.canDetectOrientation()) { - Log.v(this, "Orientation detection enabled."); - mOrientationEventListener.enable(); - } else { - Log.v(this, "Orientation detection disabled."); - mOrientationEventListener.disable(); - } - // setting activity should be last thing in setup process InCallPresenter.getInstance().setActivity(this); enableInCallOrientationEventListener(getRequestedOrientation() == @@ -298,7 +285,6 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD enableInCallOrientationEventListener(false); InCallPresenter.getInstance().updateIsChangingConfigurations(); InCallPresenter.getInstance().onActivityStopped(); - mOrientationEventListener.disable(); super.onStop(); } -- cgit v1.2.3