Merge nyc-car-dev

         caa94c65 MAP MCE Kitchen Sink
         ac9a1546 Merge "MAP MCE Kitchen Sink" into nyc-car-dev
         20539ba7 check negative size before reading Blob
         6dcc50be fix synchronization in PM and PowerHal
         83569f3f Merge "fix synchronization in PM and PowerHal" into nyc-car-dev
         afdc9ae8 Add test for SystemActivityMonitoringService
         d4e8ee2c Merge "Add test for SystemActivityMonitoringService" into nyc-car-dev
         80ebb3f9 Increase coverage for CarSensorManagerTest
         a88b3e72 Merge "Increase coverage for CarSensorManagerTest" into nyc-car-dev
         5f537ee9 Handle all zone types properly in CarPopertyUtils.
         f9215209 update TODOs
         bbdfa549 Merge "Handle all zone types properly in CarPopertyUtils." into nyc-car-dev
         20fcace9 Merge "update TODOs" into nyc-car-dev
         c26f6bec fix memory leak in BinderInterfaceContainer
         5f6c26bc InstCluster: add rebinding to onServiceDisconnected
         9d08dc39 Minor fixes to Car Support Lib
         eb19cac8 Merge "Minor fixes to Car Support Lib" into nyc-car-dev
         7500e219 Update size of scroll bar buttons for PageListView
         c9a023d1 fix failing car service test
         a90995ad MAP MCE iPhone Connectivity
         e917be0a Merge "MAP MCE iPhone Connectivity" into nyc-car-dev
         b982e641 Put launcher in the activity stack before we show the block activity.
         1093d084 Merge "Put launcher in the activity stack before we show the block activity." into nyc-car-dev
         7151bb3e fix memory leak in vns
         1a0d6548 fix wrong area type mapping in hvac
         6817797a Update javadoc for CarCabinManager and CarHvacManager
         09a67501 Update car_paged_recycler_view in car-ui-provider
         b3af9fb8 Merge "Update javadoc for CarCabinManager and
         CarHvacManager" into nyc-car-dev

- temporarily disabled BT related changes as API is not merged yet

bug: 32029701
Test: car service test
Change-Id: Ie99f67d9316824378c4b6fcb156a7a26fbd75f52

1 files changed, 9 insertions, 1 deletions

diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
index d4ba6ad385..3f4f6f9421 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
@@ -50,6 +50,7 @@ import com.google.android.car.kitchensink.sensor.SensorsTestFragment;
 import com.google.android.car.kitchensink.setting.CarServiceSettingsActivity;
 import com.google.android.car.kitchensink.touch.TouchTestFragment;
 import com.google.android.car.kitchensink.volume.VolumeTestFragment;
+//import com.google.android.car.kitchensink.bluetooth.MapMceTestFragment;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -72,6 +73,7 @@ public class KitchenSinkActivity extends CarDrawerActivity {
     private static final String MENU_CUBES_TEST = "cubes test";
     private static final String MENU_CAR_SETTINGS = "car service settings";
     private static final String MENU_ORIENTATION = "orientation test";
+    private static final String MENU_MAP_MESSAGING = "bluetooth messaging test";
 
     private Car mCarApi;
     private CarCameraManager mCameraManager;
@@ -92,6 +94,7 @@ public class KitchenSinkActivity extends CarDrawerActivity {
     private TouchTestFragment mTouchTestFragment;
     private CubesTestFragment mCubesTestFragment;
     private OrientationTestFragment mOrientationFragment;
+    //private MapMceTestFragment mMapMceTestFragment;
 
     private final CarSensorManager.OnSensorChangedListener mListener =
             new CarSensorManager.OnSensorChangedListener() {
@@ -226,7 +229,7 @@ public class KitchenSinkActivity extends CarDrawerActivity {
                         MENU_AUDIO, MENU_RADIO, MENU_CAMERA, MENU_HVAC, MENU_JOB, MENU_KEYBOARD,
                         MENU_CLUSTER, MENU_INPUT_TEST, MENU_SENSORS, MENU_VOLUME_TEST,
                         MENU_TOUCH_TEST, MENU_CUBES_TEST, MENU_CAR_SETTINGS, MENU_ORIENTATION,
-                        MENU_QUIT
+                        MENU_MAP_MESSAGING, MENU_QUIT
                 };
                 for (String menu : allMenus) {
                     items.add(new CarMenu.Builder(menu).setText(menu).build());
@@ -314,6 +317,11 @@ public class KitchenSinkActivity extends CarDrawerActivity {
                     mOrientationFragment = new OrientationTestFragment();
                 }
                 showFragment(mOrientationFragment);
+            //} else if (id.equals(MENU_MAP_MESSAGING)) {
+            //    if (mMapMceTestFragment == null) {
+            //        mMapMceTestFragment = new MapMceTestFragment();
+            //    }
+            //    showFragment(mMapMceTestFragment);
             } else if (id.equals(MENU_QUIT)) {
                 finish();
             }