Snap for 11472172 from ad91a448980c65e6f366feda59eb75961f06489e to emu-34-2-release

Change-Id: Ieaf760454b7d59780f0ca4aeda35baf7a5a49321

3 files changed, 6 insertions, 8 deletions

diff --git a/base/Android.bp b/base/Android.bp
index e767958..d01d66c 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_automotive",
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // all of the 'license_kinds' from "hardware_google_aemu_license"
@@ -45,7 +46,7 @@ cc_library_static {
 // Run with `atest --host gfxstream_base_tests`
 cc_test_host {
     name: "gfxstream_base_tests",
-    defaults: [ "gfxstream_defaults" ],
+    defaults: ["gfxstream_defaults"],
     srcs: [
         "LruCache_unittest.cpp",
     ],
@@ -62,7 +63,7 @@ cc_test_host {
 
 cc_test_library {
     name: "gfxstream_base_test_support",
-    defaults: [ "gfxstream_defaults" ],
+    defaults: ["gfxstream_defaults"],
     srcs: [
         "testing/file_io.cpp",
     ],
diff --git a/base/include/aemu/base/LayoutResolver.h b/base/include/aemu/base/LayoutResolver.h
index 00940bb..ef61fdc 100644
--- a/base/include/aemu/base/LayoutResolver.h
+++ b/base/include/aemu/base/LayoutResolver.h
@@ -29,8 +29,7 @@ std::unordered_map<uint32_t, std::pair<uint32_t, uint32_t>> resolveLayout(
         const double monitorAspectRatio);
 
 std::unordered_map<uint32_t, std::pair<uint32_t, uint32_t>> resolveStackedLayout(
-        std::unordered_map<uint32_t, std::pair<uint32_t, uint32_t>> rectangles,
-        const uint32_t monitorWidth);
+        std::unordered_map<uint32_t, std::pair<uint32_t, uint32_t>> rectangles);
 
 }  // namespace base
 }  // namespace android
diff --git a/host-common/include/host-common/FeatureControl.h b/host-common/include/host-common/FeatureControl.h
index 0b4593c..57e0621 100644
--- a/host-common/include/host-common/FeatureControl.h
+++ b/host-common/include/host-common/FeatureControl.h
@@ -28,9 +28,7 @@ namespace featurecontrol {
 
 // featurecontrol is used to switch on/off advanced features It loads
 // sdk/emulator/lib/advancedFeatures.ini for default values and
-// .android/advancedFeatures.ini for user overriden values.  If on canary
-// update channel, sdk/emulator/lib/advancedFeaturesCanary.ini is used for
-// default values.
+// .android/advancedFeatures.ini for user overridden values.
 // It is expected to be initialized at the beginning of the emulator.
 // For easier testing, one may also want to pass the override value through
 // command line and call setEnabledOverride. (Command line override not
@@ -39,7 +37,7 @@ namespace featurecontrol {
 // featurecontrol::isEnabled is thread safe, all other methods are not.
 //
 // To add new features, please (1) add it to android/data/advancedFeatures.ini
-// or android/data/advancedFeaturesCanary.ini and (2) add a new line to
+// and (2) add a new line to
 // FeatureControlDef.h, in the following format:
 // FEATURE_CONTROL_ITEM(YOUR_FEATURE_NAME)