Protecting VmsSubscriberManager with the future annotation and future flag.
Needed to move the FeatureConfiguration.java from service to car-lib
because it is used in Car.java
This is a post-O feature.
Bug: b/34976096
Test: Build with TARGET_USES_CAR_FUTURE_FEATURES set to true and to false.
Change-Id: I25848a0bfe6a6d59181dde48399fd2e1e8f10e4c
diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index d5afb3c..2d58eb1 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -21,7 +21,6 @@
import android.car.ICar;
import android.car.annotation.FutureFeature;
import android.car.cluster.renderer.IInstrumentClusterNavigation;
-import android.car.internal.FeatureUtil;
import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.automotive.vehicle.V2_0.IVehicle;
@@ -30,6 +29,8 @@
import com.android.car.cluster.InstrumentClusterService;
import com.android.car.hal.VehicleHal;
+import com.android.car.internal.FeatureConfiguration;
+import com.android.car.internal.FeatureUtil;
import com.android.car.pm.CarPackageManagerService;
import com.android.internal.annotations.GuardedBy;