summaryrefslogtreecommitdiff
path: root/core/java/android/content/ContextWrapper.java
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2016-06-16 18:05:41 -0700
committerAdam Lesinski <adamlesinski@google.com>2016-06-21 17:55:58 -0700
commit4ece3d6bb18a609afcd0e82f0340b7d36ba24eea (patch)
tree5cdbf44c4ed33767fe334feca6add5d106f40714 /core/java/android/content/ContextWrapper.java
parentf184789ae9154059a2b74cab386a65b04cefc9c0 (diff)
ContextImpl: Keep DisplayAdjustments and Display in sync
Make sure that when our Resources get updated, that DisplayAdjustment and Display properly reflect the potentially new screen dimensions. Bug:28388969 Change-Id: I340550ea094ece87abc8790dd46aaa60ab3cedd3
Diffstat (limited to 'core/java/android/content/ContextWrapper.java')
-rw-r--r--core/java/android/content/ContextWrapper.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index 087ac4781803..60da63e9bc09 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -819,6 +819,14 @@ public class ContextWrapper extends Context {
return mBase.getDisplayAdjustments(displayId);
}
+ /**
+ * @hide
+ */
+ @Override
+ public Display getDisplay() {
+ return mBase.getDisplay();
+ }
+
@Override
public Context createDeviceProtectedStorageContext() {
return mBase.createDeviceProtectedStorageContext();