diff options
author | Rekha Kumar <rekhak@codeaurora.org> | 2015-06-17 13:15:25 -0700 |
---|---|---|
committer | Tyler Gunn <tgunn@google.com> | 2015-12-06 22:04:44 -0800 |
commit | a62dc2266449adc677ddc7c8141e615f95e3652c (patch) | |
tree | 94b8236c1bc30dca151155b8767ec3f661a6fba0 | |
parent | 70c216c16d28552d851aadcc0bf6928522f0da6b (diff) |
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
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 14 |
1 files changed, 0 insertions, 14 deletions
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(); } |