Merge changes I3f205a0e,Ied9c04a1
* changes:
Make VNC server aware of the screen width alignment
Use the same screen width aligment with both VMMs
diff --git a/guest/monitoring/vsoc_service/Android.mk b/guest/monitoring/vsoc_service/Android.mk
index ad8ce40..2f30405 100644
--- a/guest/monitoring/vsoc_service/Android.mk
+++ b/guest/monitoring/vsoc_service/Android.mk
@@ -20,7 +20,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, java)
LOCAL_STATIC_JAVA_LIBRARIES := guava
LOCAL_PACKAGE_NAME := VSoCService
-LOCAL_SDK_VERSION := 26
+LOCAL_SDK_VERSION := 28
LOCAL_PROGUARD_FLAGS := -include build/core/proguard.flags
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_VENDOR_MODULE := true
diff --git a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/JobExecutor.java b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/JobExecutor.java
index 9cb3225..1eed006 100644
--- a/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/JobExecutor.java
+++ b/guest/monitoring/vsoc_service/java/com/android/google/gce/gceservice/JobExecutor.java
@@ -49,8 +49,13 @@
public void schedule(final JobBase job, final GceFuture<?>... futures) {
mExecutor.schedule(new Runnable() {
private boolean mDependenciesReady = false;
- private ArrayList<GceFuture<?>> mFutures =
- new ArrayList<GceFuture<?>>(Arrays.asList(futures));
+ private ArrayList<GceFuture<?>> mFutures = new ArrayList<GceFuture<?>>();
+
+ {
+ for (GceFuture<?> future: futures) {
+ mFutures.add(future);
+ }
+ }
public void run() {
if (!mDependenciesReady) {
