Fix for solid blue screen if CircularRevealActivity is not finished
If the ActivityManager doesn't finish and destroy
CircularRevealActivity automatically it can trigger onNewIntent on
the activity instead of onCreate the next time a call is started.
Make sure to handle that case as well.
Bug: 19428365
Change-Id: If051ebd449a7deddfdc60ae856e9e1a0f3cda77d
diff --git a/InCallUI/src/com/android/incallui/CircularRevealActivity.java b/InCallUI/src/com/android/incallui/CircularRevealActivity.java
index 7a9b7cc..4dc58ba 100644
--- a/InCallUI/src/com/android/incallui/CircularRevealActivity.java
+++ b/InCallUI/src/com/android/incallui/CircularRevealActivity.java
@@ -59,9 +59,7 @@
super.onCreate(savedInstanceState);
overridePendingTransition(0, 0);
setContentView(R.layout.outgoing_call_animation);
- final Point touchPoint = getIntent().getParcelableExtra(TouchPointManager.TOUCH_POINT);
- final MaterialPalette palette = getIntent().getParcelableExtra(EXTRA_THEME_COLORS);
- setupDecorView(touchPoint, palette);
+ prepareDecorViewFromIntent(getIntent());
}
@Override
@@ -81,6 +79,18 @@
super.onStop();
}
+ @Override
+ protected void onNewIntent(Intent intent) {
+ setIntent(intent);
+ prepareDecorViewFromIntent(intent);
+ }
+
+ private void prepareDecorViewFromIntent(Intent intent) {
+ final Point touchPoint = intent.getParcelableExtra(TouchPointManager.TOUCH_POINT);
+ final MaterialPalette palette = intent.getParcelableExtra(EXTRA_THEME_COLORS);
+ setupDecorView(touchPoint, palette);
+ }
+
private void setupDecorView(final Point touchPoint, MaterialPalette palette) {
final View view = getWindow().getDecorView();