summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wale Ogunwale <ogunwale@google.com> 2017-08-22 18:55:07 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-08-22 18:55:07 +0000
commit03c1307308c4b63c80c5e46d30e81268cfec1d56 (patch)
tree1b30e3c1559eeef1a566ce6f4bf1dadfe63871e8
parent5ee22a92e3ea66385f35875cfef154bc61704a41 (diff)
parent5613fdb0cdc1f8289c0d6cfa21664ec3605d7499 (diff)
Merge "Fixed build breakage"
-rw-r--r--services/core/java/com/android/server/wm/ConfigurationContainer.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ConfigurationContainer.java b/services/core/java/com/android/server/wm/ConfigurationContainer.java
index 5752982abb27..67112577b977 100644
--- a/services/core/java/com/android/server/wm/ConfigurationContainer.java
+++ b/services/core/java/com/android/server/wm/ConfigurationContainer.java
@@ -111,7 +111,8 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> {
}
/** Sets the windowing mode for the configuration container. */
- void setWindowingMode(@WindowConfiguration.WindowingMode int windowingMode) {
+ void setWindowingMode(/*@WindowConfiguration.WindowingMode TODO: causes build error...why?*/
+ int windowingMode) {
mOverrideConfiguration.windowConfiguration.setWindowingMode(windowingMode);
onOverrideConfigurationChanged(mOverrideConfiguration);
}