Snap for 4784261 from 6fbb7f89ac829e8ea53ec2b92acbfe36619a9869 to pi-release

Change-Id: Ie62d8f1cc85710314aa228d42750245193f63689

30 files changed, 268 insertions, 37 deletions

diff --git a/car_product/build/car.mk b/car_product/build/car.mk
index 22a56667..669e828d 100644
--- a/car_product/build/car.mk
+++ b/car_product/build/car.mk
@@ -16,6 +16,9 @@
 
 # Common make file for all car builds
 
+BOARD_PLAT_PUBLIC_SEPOLICY_DIR += packages/services/Car/car_product/sepolicy/public
+BOARD_PLAT_PRIVATE_SEPOLICY_DIR += packages/services/Car/car_product/sepolicy/private
+
 PRODUCT_PACKAGES += \
     Bluetooth \
     OneTimeInitializer \
@@ -40,6 +43,8 @@ PRODUCT_PACKAGES += \
     DirectRenderingClusterSample \
     com.android.car.powertestservice \
 
+# SEPolicy for test apps / services
+BOARD_SEPOLICY_DIRS += packages/services/Car/car_product/sepolicy/test
 endif
 
 PRODUCT_COPY_FILES := \
diff --git a/car_product/build/car_base.mk b/car_product/build/car_base.mk
index 0181ec13..91380902 100644
--- a/car_product/build/car_base.mk
+++ b/car_product/build/car_base.mk
@@ -19,9 +19,6 @@
 
 PRODUCT_PACKAGE_OVERLAYS += packages/services/Car/car_product/overlay
 
-# TODO: need to split policy by partition: public/private/vendor
-BOARD_SEPOLICY_DIRS += packages/services/Car/car_product/sepolicy
-
 PRODUCT_PACKAGES += \
     ContactsProvider \
     DefaultContainerService \
diff --git a/car_product/sepolicy/domain.te b/car_product/sepolicy/domain.te
deleted file mode 100644
index d643e83b..00000000
--- a/car_product/sepolicy/domain.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ignore personality-8 denials.
-dontaudit domain kernel:system module_request;
diff --git a/car_product/sepolicy/init.te b/car_product/sepolicy/init.te
deleted file mode 100644
index a80ab0e9..00000000
--- a/car_product/sepolicy/init.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# Allow legacy sdcard for creating directory symlinks
-allow init tmpfs:lnk_file create_file_perms;
diff --git a/car_product/sepolicy/netd.te b/car_product/sepolicy/netd.te
deleted file mode 100644
index 2b002ec9..00000000
--- a/car_product/sepolicy/netd.te
+++ /dev/null
@@ -1 +0,0 @@
-dontaudit netd self:capability sys_module;
diff --git a/car_product/sepolicy/carservice_app.te b/car_product/sepolicy/private/carservice_app.te
index af119a8a..247cd4da 100644
--- a/car_product/sepolicy/carservice_app.te
+++ b/car_product/sepolicy/private/carservice_app.te
@@ -1,5 +1,4 @@
 # Domain to run Car Service (com.android.car)
-type carservice_app, domain, coredomain;
 app_domain(carservice_app);
 
 # Allow Car Service to be the client of Vehicle and Audio Control HALs
@@ -17,7 +16,10 @@ allow carservice_app carservice_service:service_manager add;
 allow carservice_app {
     accessibility_service
     activity_service
+    audio_service
+    audioserver_service
     autofill_service
+    bluetooth_manager_service
     connectivity_service
     content_service
     deviceidle_service
@@ -28,6 +30,7 @@ allow carservice_app {
     location_service
     network_management_service
     power_service
+    procfsinspector_service
     sensorservice_service
     surfaceflinger_service
     uimode_service
@@ -39,3 +42,8 @@ allow carservice_app system_app_data_file:{ file lnk_file } create_file_perms;
 
 # For I/O stats tracker
 allow carservice_app proc_uid_io_stats:file { read open getattr };
+
+allow carservice_app procfsinspector:binder call;
+
+# To access /sys/fs/<type>/<partition>/lifetime_write_kbytes
+allow carservice_app sysfs_fs_lifetime_write:file { getattr open read };
diff --git a/procfs-inspector/server/sepolicy/file_contexts b/car_product/sepolicy/private/file_contexts
index 52839933..52839933 100644
--- a/procfs-inspector/server/sepolicy/file_contexts
+++ b/car_product/sepolicy/private/file_contexts
diff --git a/car_product/sepolicy/private/procfsinspector.te b/car_product/sepolicy/private/procfsinspector.te
new file mode 100644
index 00000000..8e1a5334
--- /dev/null
+++ b/car_product/sepolicy/private/procfsinspector.te
@@ -0,0 +1,9 @@
+type procfsinspector, domain, coredomain;
+type procfsinspector_exec, exec_type, file_type;
+
+init_daemon_domain(procfsinspector)
+
+add_service(procfsinspector, procfsinspector_service)
+binder_use(procfsinspector)
+
+allow carservice_app procfsinspector:binder call;
diff --git a/car_product/sepolicy/private/property.te b/car_product/sepolicy/private/property.te
new file mode 100644
index 00000000..409cbdc6
--- /dev/null
+++ b/car_product/sepolicy/private/property.te
@@ -0,0 +1 @@
+type car_prop, property_type;
diff --git a/car_product/sepolicy/private/property_contexts b/car_product/sepolicy/private/property_contexts
new file mode 100644
index 00000000..da14e3e0
--- /dev/null
+++ b/car_product/sepolicy/private/property_contexts
@@ -0,0 +1 @@
+boot.car_service_created   u:object_r:car_prop:s0
diff --git a/car_product/sepolicy/private/seapp_contexts b/car_product/sepolicy/private/seapp_contexts
new file mode 100644
index 00000000..97217bf2
--- /dev/null
+++ b/car_product/sepolicy/private/seapp_contexts
@@ -0,0 +1 @@
+user=system seinfo=platform name=com.android.car domain=carservice_app type=system_app_data_file
diff --git a/car_product/sepolicy/private/service_contexts b/car_product/sepolicy/private/service_contexts
new file mode 100644
index 00000000..7ac544c1
--- /dev/null
+++ b/car_product/sepolicy/private/service_contexts
@@ -0,0 +1,2 @@
+car_service  u:object_r:carservice_service:s0
+com.android.car.procfsinspector u:object_r:procfsinspector_service:s0
diff --git a/car_product/sepolicy/property.te b/car_product/sepolicy/property.te
deleted file mode 100644
index 64340e7c..00000000
--- a/car_product/sepolicy/property.te
+++ /dev/null
@@ -1,3 +0,0 @@
-type hw_cabl_prop, property_type;
-type wlan_driver_prop, property_type;
-type car_prop, property_type;
diff --git a/car_product/sepolicy/property_contexts b/car_product/sepolicy/property_contexts
deleted file mode 100644
index a6ffc71e..00000000
--- a/car_product/sepolicy/property_contexts
+++ /dev/null
@@ -1,4 +0,0 @@
-hw.cabl.                   u:object_r:hw_cabl_prop:s0
-wlan.driver.               u:object_r:wlan_driver_prop:s0
-
-boot.car_service_created   u:object_r:car_prop:s0
diff --git a/car_product/sepolicy/public/carservice_app.te b/car_product/sepolicy/public/carservice_app.te
new file mode 100644
index 00000000..fd276b63
--- /dev/null
+++ b/car_product/sepolicy/public/carservice_app.te
@@ -0,0 +1,2 @@
+# Domain to run Car Service (com.android.car)
+type carservice_app, domain, coredomain;
diff --git a/car_product/sepolicy/public/file.te b/car_product/sepolicy/public/file.te
new file mode 100644
index 00000000..ea79a248
--- /dev/null
+++ b/car_product/sepolicy/public/file.te
@@ -0,0 +1,5 @@
+# This type for lifetime_write_kbytes files which resides in
+# /sys/fs/<filesystem>/<partition>/lifetime_writes_kbytes
+# Vendors are supposed to extend genfs_contexts with the
+# partition names for their devices.
+type sysfs_fs_lifetime_write, sysfs_type, fs_type;
diff --git a/car_product/sepolicy/public/service.te b/car_product/sepolicy/public/service.te
new file mode 100644
index 00000000..6c514f31
--- /dev/null
+++ b/car_product/sepolicy/public/service.te
@@ -0,0 +1,2 @@
+type carservice_service, service_manager_type;
+type procfsinspector_service, service_manager_type;
diff --git a/car_product/sepolicy/seapp_contexts b/car_product/sepolicy/seapp_contexts
deleted file mode 100644
index ec629bec..00000000
--- a/car_product/sepolicy/seapp_contexts
+++ /dev/null
@@ -1,4 +0,0 @@
-user=system seinfo=platform name=com.android.car domain=carservice_app type=system_app_data_file
-
-# Allow Kitchen Sink app (for test purpose) to run in the Car Service security domain
-user=system seinfo=platform name=com.google.android.car.kitchensink domain=carservice_app type=system_app_data_file
diff --git a/car_product/sepolicy/service.te b/car_product/sepolicy/service.te
deleted file mode 100644
index 6eff13bb..00000000
--- a/car_product/sepolicy/service.te
+++ /dev/null
@@ -1 +0,0 @@
-type carservice_service, service_manager_type;
diff --git a/car_product/sepolicy/service_contexts b/car_product/sepolicy/service_contexts
deleted file mode 100644
index 844d65d4..00000000
--- a/car_product/sepolicy/service_contexts
+++ /dev/null
@@ -1 +0,0 @@
-car_service  u:object_r:carservice_service:s0
diff --git a/car_product/sepolicy/system_server.te b/car_product/sepolicy/system_server.te
deleted file mode 100644
index b6785c16..00000000
--- a/car_product/sepolicy/system_server.te
+++ /dev/null
@@ -1,4 +0,0 @@
-# Set wlan.driver.* properties.
-set_prop(system_server, wlan_driver_prop)
-
-dontaudit system_server self:capability sys_module;
diff --git a/car_product/sepolicy/file_contexts b/car_product/sepolicy/test/file_contexts
index 7be7605f..7be7605f 100644
--- a/car_product/sepolicy/file_contexts
+++ b/car_product/sepolicy/test/file_contexts
diff --git a/car_product/sepolicy/test/kitchensink_app.te b/car_product/sepolicy/test/kitchensink_app.te
new file mode 100644
index 00000000..8bd5a68e
--- /dev/null
+++ b/car_product/sepolicy/test/kitchensink_app.te
@@ -0,0 +1,30 @@
+# Domain to run EmbeddedKitchenSink app (for test-purpose)
+type kitchensink_app, domain;
+app_domain(kitchensink_app);
+
+# Allow Car Service to be the client of Vehicle HAL
+hal_client_domain(kitchensink_app, hal_vehicle)
+
+# Keep alphabetically sorted.
+allow kitchensink_app {
+    accessibility_service
+    activity_service
+    autofill_service
+    connectivity_service
+    content_service
+    deviceidle_service
+    display_service
+    graphicsstats_service
+    input_method_service
+    input_service
+    location_service
+    network_management_service
+    power_service
+    sensorservice_service
+    surfaceflinger_service
+    uimode_service
+}:service_manager find;
+
+# Read and write /data/data subdirectory.
+allow kitchensink_app system_app_data_file:dir { create_dir_perms getattr };
+allow kitchensink_app system_app_data_file:{ file lnk_file } create_file_perms;
diff --git a/car_product/sepolicy/powertestservice.te b/car_product/sepolicy/test/powertestservice.te
index 2e2ace7f..2e2ace7f 100644
--- a/car_product/sepolicy/powertestservice.te
+++ b/car_product/sepolicy/test/powertestservice.te
diff --git a/car_product/sepolicy/test/seapp_contexts b/car_product/sepolicy/test/seapp_contexts
new file mode 100644
index 00000000..530e60ec
--- /dev/null
+++ b/car_product/sepolicy/test/seapp_contexts
@@ -0,0 +1 @@
+user=system seinfo=platform name=com.google.android.car.kitchensink domain=kitchensink_app type=system_app_data_file
diff --git a/procfs-inspector/server/Android.mk b/procfs-inspector/server/Android.mk
index d6a7d437..fab1cf88 100644
--- a/procfs-inspector/server/Android.mk
+++ b/procfs-inspector/server/Android.mk
@@ -18,9 +18,6 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
-BOARD_SEPOLICY_DIRS += \
-    packages/services/Car/procfs-inspector/server/sepolicy
-
 LOCAL_SRC_FILES := \
     main.cpp \
     server.cpp \
diff --git a/procfs-inspector/server/sepolicy/com.android.car.procfsinspector.te b/procfs-inspector/server/sepolicy/com.android.car.procfsinspector.te
deleted file mode 100644
index acd7ddf0..00000000
--- a/procfs-inspector/server/sepolicy/com.android.car.procfsinspector.te
+++ /dev/null
@@ -1,6 +0,0 @@
-type procfsinspector, domain, coredomain;
-type procfsinspector_exec, exec_type, file_type;
-
-init_daemon_domain(procfsinspector)
-
-allow system_app procfsinspector:binder call;
diff --git a/service/src/com/android/car/CarVolumeGroup.java b/service/src/com/android/car/CarVolumeGroup.java
index 7975f9c4..448979bb 100644
--- a/service/src/com/android/car/CarVolumeGroup.java
+++ b/service/src/com/android/car/CarVolumeGroup.java
@@ -111,7 +111,7 @@ import java.util.Arrays;
         if (info.getMinGain() < mMinGain) {
             mMinGain = info.getMinGain();
         }
-        if (mStoredGainIndex < 0) {
+        if (mStoredGainIndex < getMinGainIndex() || mStoredGainIndex > getMaxGainIndex()) {
             // We expected to load a value from last boot, but if we didn't (perhaps this is the
             // first boot ever?), then use the highest "default" we've seen to initialize
             // ourselves.
diff --git a/tests/carservice_test/Android.mk b/tests/carservice_test/Android.mk
index 0ed57d47..d4c327ce 100644
--- a/tests/carservice_test/Android.mk
+++ b/tests/carservice_test/Android.mk
@@ -44,7 +44,8 @@ LOCAL_STATIC_JAVA_LIBRARIES += car-service-lib-for-test \
                                mockito-target-inline \
                                android-support-test \
                                android.hardware.automotive.vehicle-V2.0-java \
-                               com.android.car.test.utils
+                               com.android.car.test.utils \
+                               truth-prebuilt
 
 LOCAL_JAVA_LIBRARIES := android.car android.test.runner android.test.base
 
diff --git a/tests/carservice_test/src/com/android/car/CarDrivingRestrictionsTest.java b/tests/carservice_test/src/com/android/car/CarDrivingRestrictionsTest.java
new file mode 100644
index 00000000..ff93e668
--- /dev/null
+++ b/tests/carservice_test/src/com/android/car/CarDrivingRestrictionsTest.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.car;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.car.Car;
+import android.car.CarNotConnectedException;
+import android.car.drivingstate.CarDrivingStateEvent;
+import android.car.drivingstate.CarDrivingStateManager;
+import android.car.drivingstate.CarUxRestrictions;
+import android.car.drivingstate.CarUxRestrictionsManager;
+import android.hardware.automotive.vehicle.V2_0.VehicleGear;
+import android.hardware.automotive.vehicle.V2_0.VehicleProperty;
+import android.os.SystemClock;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import com.android.car.vehiclehal.VehiclePropValueBuilder;
+import com.android.internal.annotations.GuardedBy;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class CarDrivingRestrictionsTest extends MockedCarTestBase {
+    private static final String TAG = CarDrivingRestrictionsTest.class
+            .getSimpleName();
+    private CarDrivingStateManager mCarDrivingStateManager;
+    private CarUxRestrictionsManager mCarUxRManager;
+
+    @Override
+    protected synchronized void configureMockedHal() {
+        addProperty(VehicleProperty.PERF_VEHICLE_SPEED, VehiclePropValueBuilder
+                .newBuilder(VehicleProperty.PERF_VEHICLE_SPEED)
+                .addFloatValue(0f)
+                .build());
+        addProperty(VehicleProperty.PARKING_BRAKE_ON, VehiclePropValueBuilder
+                .newBuilder(VehicleProperty.PARKING_BRAKE_ON)
+                .setBooleanValue(false)
+                .build());
+        addProperty(VehicleProperty.GEAR_SELECTION, VehiclePropValueBuilder
+                .newBuilder(VehicleProperty.GEAR_SELECTION)
+                .addIntValue(0)
+                .build());
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mCarDrivingStateManager = (CarDrivingStateManager) getCar()
+                .getCarManager(Car.CAR_DRIVING_STATE_SERVICE);
+        mCarUxRManager = (CarUxRestrictionsManager) getCar()
+                .getCarManager(Car.CAR_UX_RESTRICTION_SERVICE);
+    }
+
+    @Test
+    public void testDrivingStateChange() throws CarNotConnectedException, InterruptedException {
+        CarDrivingStateEvent drivingEvent;
+        CarUxRestrictions restrictions;
+        DrivingStateListener listener = new DrivingStateListener();
+        mCarDrivingStateManager.registerListener(listener);
+        mCarUxRManager.registerListener(listener);
+        // With no gear value available, driving state should be unknown
+        listener.reset();
+        getMockedVehicleHal().injectEvent(
+                VehiclePropValueBuilder.newBuilder(VehicleProperty.PERF_VEHICLE_SPEED)
+                        .addFloatValue(0.0f)
+                        .setTimestamp(SystemClock.elapsedRealtimeNanos())
+                        .build());
+
+        // Test Parked state and corresponding restrictions based on car_ux_restrictions_map.xml
+        //listener.reset();
+        getMockedVehicleHal().injectEvent(
+                VehiclePropValueBuilder.newBuilder(VehicleProperty.GEAR_SELECTION)
+                        .addIntValue(VehicleGear.GEAR_PARK)
+                        .setTimestamp(SystemClock.elapsedRealtimeNanos())
+                        .build());
+        drivingEvent = listener.waitForDrivingStateChange();
+        assertNotNull(drivingEvent);
+        assertThat(drivingEvent.eventValue).isEqualTo(CarDrivingStateEvent.DRIVING_STATE_PARKED);
+
+        // Test Idling state and corresponding restrictions based on car_ux_restrictions_map.xml
+        listener.reset();
+        getMockedVehicleHal().injectEvent(
+                VehiclePropValueBuilder.newBuilder(VehicleProperty.GEAR_SELECTION)
+                        .addIntValue(VehicleGear.GEAR_DRIVE)
+                        .setTimestamp(SystemClock.elapsedRealtimeNanos())
+                        .build());
+        drivingEvent = listener.waitForDrivingStateChange();
+        assertNotNull(drivingEvent);
+        assertThat(drivingEvent.eventValue).isEqualTo(CarDrivingStateEvent.DRIVING_STATE_IDLING);
+        restrictions = listener.waitForUxRestrictionsChange();
+        assertNotNull(restrictions);
+        assertTrue(restrictions.isRequiresDistractionOptimization());
+        assertThat(restrictions.getActiveRestrictions())
+                .isEqualTo(CarUxRestrictions.UX_RESTRICTIONS_BASELINE);
+
+
+        // Test Moving state and corresponding restrictions based on car_ux_restrictions_map.xml
+        listener.reset();
+        getMockedVehicleHal().injectEvent(
+                VehiclePropValueBuilder.newBuilder(VehicleProperty.PERF_VEHICLE_SPEED)
+                        .addFloatValue(30.0f)
+                        .setTimestamp(SystemClock.elapsedRealtimeNanos())
+                        .build());
+        drivingEvent = listener.waitForDrivingStateChange();
+        assertNotNull(drivingEvent);
+        assertThat(drivingEvent.eventValue).isEqualTo(CarDrivingStateEvent.DRIVING_STATE_MOVING);
+        restrictions = listener.waitForUxRestrictionsChange();
+        assertNotNull(restrictions);
+        assertTrue(restrictions.isRequiresDistractionOptimization());
+        assertThat(restrictions.getActiveRestrictions())
+                .isEqualTo(CarUxRestrictions.UX_RESTRICTIONS_FULLY_RESTRICTED);
+    }
+
+    /**
+     * Callback function we register for driving state update notifications.
+     */
+    private class DrivingStateListener implements
+            CarDrivingStateManager.CarDrivingStateEventListener,
+            CarUxRestrictionsManager.onUxRestrictionsChangedListener {
+        private final Object mDrivingStateLock = new Object();
+        @GuardedBy("mDrivingStateLock")
+        private CarDrivingStateEvent mLastEvent = null;
+        private final Object mUxRLock = new Object();
+        @GuardedBy("mUxRLock")
+        private CarUxRestrictions mLastRestrictions = null;
+
+        void reset() {
+            mLastEvent = null;
+            mLastRestrictions = null;
+        }
+
+        // Returns True to indicate receipt of a driving state event.  False indicates a timeout.
+        CarDrivingStateEvent waitForDrivingStateChange() throws InterruptedException {
+            long start = SystemClock.elapsedRealtime();
+
+            synchronized (mDrivingStateLock) {
+                while (mLastEvent == null
+                        && (start + DEFAULT_WAIT_TIMEOUT_MS > SystemClock.elapsedRealtime())) {
+                    mDrivingStateLock.wait(100L);
+                }
+                return mLastEvent;
+            }
+        }
+
+        @Override
+        public void onDrivingStateChanged(CarDrivingStateEvent event) {
+            Log.d(TAG, "onDrivingStateChanged, event: " + event.eventValue);
+            synchronized (mDrivingStateLock) {
+                // We're going to hold a reference to this object
+                mLastEvent = event;
+                mDrivingStateLock.notify();
+            }
+        }
+
+        CarUxRestrictions waitForUxRestrictionsChange() throws InterruptedException {
+            long start = SystemClock.elapsedRealtime();
+            synchronized (mUxRLock) {
+                while (mLastRestrictions == null
+                        && (start + DEFAULT_WAIT_TIMEOUT_MS > SystemClock.elapsedRealtime())) {
+                    mUxRLock.wait(100L);
+                }
+            }
+            return mLastRestrictions;
+        }
+
+        @Override
+        public void onUxRestrictionsChanged(CarUxRestrictions restrictions) {
+            Log.d(TAG, "onUxRestrictionsChanged, restrictions: "
+                    + restrictions.getActiveRestrictions());
+            synchronized (mUxRLock) {
+                mLastRestrictions = restrictions;
+                mUxRLock.notify();
+            }
+        }
+    }
+}