summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2015-06-10 19:21:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-10 19:21:13 +0000
commit4bc5054040c84e5d0e97357a30faab30ce4c5441 (patch)
tree2fe127e26522a567abaf58867382abd43b525c51 /core/java/android
parent59d6d943d86ef0e3f5ba2f03758b0d40a82639e9 (diff)
parentfe4ad335d80960233022cc2cab79338f5d327582 (diff)
Merge "Support 4K overlay displays." into mnc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/Presentation.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/Presentation.java b/core/java/android/app/Presentation.java
index bb45abb462e0..e110dcbf1d2a 100644
--- a/core/java/android/app/Presentation.java
+++ b/core/java/android/app/Presentation.java
@@ -213,7 +213,7 @@ public class Presentation extends Dialog {
// dismiss the presentation immediately. This case is expected
// to be rare but surprising, so we'll write a log message about it.
if (!isConfigurationStillValid()) {
- Log.i(TAG, "Presentation is being immediately dismissed because the "
+ Log.i(TAG, "Presentation is being dismissed because the "
+ "display metrics have changed since it was created.");
mHandler.sendEmptyMessage(MSG_CANCEL);
}
@@ -274,6 +274,8 @@ public class Presentation extends Dialog {
// is invalid and the application must recreate the presentation to get
// a new context.
if (!isConfigurationStillValid()) {
+ Log.i(TAG, "Presentation is being dismissed because the "
+ + "display metrics have changed since it was created.");
cancel();
}
}