Made android.car standalone library

It desn't depend on any library now. Moved com.android.car.internal.all
to android.car.common.
Bug: 168744732
Test: m (successful build)

Change-Id: I80eebf33f7da3f6e29fcbdd710905f12db4c4fa3

19 files changed, 29 insertions, 34 deletions

diff --git a/car-internal-lib/Android.bp b/car-internal-lib/Android.bp
index b80bd14041..5b7a5d9df2 100644
--- a/car-internal-lib/Android.bp
+++ b/car-internal-lib/Android.bp
@@ -19,14 +19,6 @@
 // supported.
 
 java_library {
-    name: "com.android.car.internal.all",
-    srcs: [
-        "src/com/android/car/internal/EventLogTags.logtags",
-        "src/com/android/car/internal/UserHelperLite.java",
-    ],
-}
-
-java_library {
     name: "com.android.car.internal.system",
     srcs: [
         "src/com/android/car/internal/SystemConstants.java",
diff --git a/car-lib/Android.bp b/car-lib/Android.bp
index 14c006d043..843b2e5abc 100644
--- a/car-lib/Android.bp
+++ b/car-lib/Android.bp
@@ -73,8 +73,11 @@ java_library {
 
 // library to access common constants between carlibrary and system server.
 java_library {
-    name: "android.car.constants",
-    srcs: ["src/android/car/Constants/CommonConstants.java"]
+    name: "com.android.car.internal.common",
+    srcs: [
+        "src/com/android/car/internal/common/**/*.java",
+        "src/com/android/car/internal/common/EventLogTags.logtags",
+    ]
 }
 
 java_library {
@@ -82,6 +85,7 @@ java_library {
     srcs: [
         "src/**/*.java",
         "src/**/I*.aidl",
+        "src/com/android/car/internal/common/EventLogTags.logtags",
     ],
     aidl: {
         include_dirs: [
@@ -92,9 +96,6 @@ java_library {
         "src/android/car/storagemonitoring/IoStats.aidl",
         "src/android/car/storagemonitoring/IoStatsEntry.aidl",
     ],
-    static_libs: [
-        "com.android.car.internal.all",
-    ],
     product_variables: {
         pdk: {
             enabled: false,
diff --git a/car-lib/src/android/car/Car.java b/car-lib/src/android/car/Car.java
index f3099d1290..9d78547dfa 100644
--- a/car-lib/src/android/car/Car.java
+++ b/car-lib/src/android/car/Car.java
@@ -33,7 +33,6 @@ import android.car.annotation.MandatoryFeature;
 import android.car.annotation.OptionalFeature;
 import android.car.cluster.CarInstrumentClusterManager;
 import android.car.cluster.ClusterActivityState;
-import android.car.constants.CommonConstants;
 import android.car.content.pm.CarPackageManager;
 import android.car.diagnostic.CarDiagnosticManager;
 import android.car.drivingstate.CarDrivingStateManager;
@@ -72,6 +71,7 @@ import android.os.TransactionTooLargeException;
 import android.os.UserHandle;
 import android.util.Log;
 
+import com.android.car.internal.common.CommonConstants;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 
diff --git a/car-lib/src/android/car/user/CarUserManager.java b/car-lib/src/android/car/user/CarUserManager.java
index 41e5974d5a..46677fc13c 100644
--- a/car-lib/src/android/car/user/CarUserManager.java
+++ b/car-lib/src/android/car/user/CarUserManager.java
@@ -33,7 +33,6 @@ import android.annotation.UserIdInt;
 import android.car.Car;
 import android.car.CarManagerBase;
 import android.car.ICarUserService;
-import android.car.constants.CommonConstants;
 import android.car.util.concurrent.AndroidAsyncFuture;
 import android.car.util.concurrent.AsyncFuture;
 import android.content.pm.UserInfo;
@@ -49,8 +48,9 @@ import android.util.ArrayMap;
 import android.util.EventLog;
 import android.util.Log;
 
-import com.android.car.internal.EventLogTags;
-import com.android.car.internal.UserHelperLite;
+import com.android.car.internal.common.CommonConstants;
+import com.android.car.internal.common.EventLogTags;
+import com.android.car.internal.common.UserHelperLite;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.infra.AndroidFuture;
diff --git a/car-lib/src/android/car/Constants/CommonConstants.java b/car-lib/src/com/android/car/internal/common/CommonConstants.java
index a80f00ed1b..739d7875be 100644
--- a/car-lib/src/android/car/Constants/CommonConstants.java
+++ b/car-lib/src/com/android/car/internal/common/CommonConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.car.constants;
+package com.android.car.internal.common;
 
 /**
  * Provides common constants for Car library, Car Service, and System Server.
diff --git a/car-internal-lib/src/com/android/car/internal/EventLogTags.logtags b/car-lib/src/com/android/car/internal/common/EventLogTags.logtags
index 84f4447950..48267dba34 100644
--- a/car-internal-lib/src/com/android/car/internal/EventLogTags.logtags
+++ b/car-lib/src/com/android/car/internal/common/EventLogTags.logtags
@@ -15,7 +15,7 @@
 
 # See system/core/logcat/event.logtags for a description of the format of this file.
 
-option java_package com.android.car.internal
+option java_package com.android.car.internal.common
 
 ####
 #### Tags used by CarServiceHelperService
diff --git a/car-internal-lib/src/com/android/car/internal/UserHelperLite.java b/car-lib/src/com/android/car/internal/common/UserHelperLite.java
index 31d173d592..4b43e06038 100644
--- a/car-internal-lib/src/com/android/car/internal/UserHelperLite.java
+++ b/car-lib/src/com/android/car/internal/common/UserHelperLite.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.car.internal;
+package com.android.car.internal.common;
 
 import android.annotation.Nullable;
 import android.annotation.UserIdInt;
@@ -23,6 +23,8 @@ import android.os.UserManager;
 
 /**
  * Provides user information related helper methods.
+ *
+ * @hide
  */
 public final class UserHelperLite {
 
diff --git a/service/src/com/android/car/CarInputService.java b/service/src/com/android/car/CarInputService.java
index 74c1679b9c..7f467ad58d 100644
--- a/service/src/com/android/car/CarInputService.java
+++ b/service/src/com/android/car/CarInputService.java
@@ -52,7 +52,7 @@ import android.view.KeyEvent;
 import android.view.ViewConfiguration;
 
 import com.android.car.hal.InputHalService;
-import com.android.car.internal.UserHelperLite;
+import com.android.car.internal.common.UserHelperLite;
 import com.android.car.user.CarUserService;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
diff --git a/service/src/com/android/car/CarService.java b/service/src/com/android/car/CarService.java
index 981943f681..c7c06bb45c 100644
--- a/service/src/com/android/car/CarService.java
+++ b/service/src/com/android/car/CarService.java
@@ -33,7 +33,7 @@ import android.os.SystemProperties;
 import android.util.EventLog;
 import android.util.Log;
 
-import com.android.car.internal.EventLogTags;
+import com.android.car.internal.common.EventLogTags;
 import com.android.car.systeminterface.SystemInterface;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.RingBufferIndices;
diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index 2f2521053d..b293f2752e 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -53,9 +53,9 @@ import com.android.car.audio.CarAudioService;
 import com.android.car.cluster.InstrumentClusterService;
 import com.android.car.garagemode.GarageModeService;
 import com.android.car.hal.VehicleHal;
-import com.android.car.internal.EventLogTags;
 import com.android.car.internal.ICarServiceHelper;
 import com.android.car.internal.ICarSystemServerClient;
+import com.android.car.internal.common.EventLogTags;
 import com.android.car.pm.CarPackageManagerService;
 import com.android.car.power.CarPowerManagementService;
 import com.android.car.power.SilentModeController;
diff --git a/service/src/com/android/car/hal/UserHalService.java b/service/src/com/android/car/hal/UserHalService.java
index a7711d5b55..d669a736d0 100644
--- a/service/src/com/android/car/hal/UserHalService.java
+++ b/service/src/com/android/car/hal/UserHalService.java
@@ -62,8 +62,8 @@ import android.util.SparseBooleanArray;
 
 import com.android.car.CarLocalServices;
 import com.android.car.CarStatsLog;
-import com.android.car.internal.EventLogTags;
-import com.android.car.internal.UserHelperLite;
+import com.android.car.internal.common.EventLogTags;
+import com.android.car.internal.common.UserHelperLite;
 import com.android.car.user.CarUserService;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java
index ef372fcfc2..cbfed6e020 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -81,8 +81,8 @@ import com.android.car.CarServiceBase;
 import com.android.car.CarServiceUtils;
 import com.android.car.R;
 import com.android.car.hal.UserHalService;
-import com.android.car.internal.EventLogTags;
-import com.android.car.internal.UserHelperLite;
+import com.android.car.internal.common.EventLogTags;
+import com.android.car.internal.common.UserHelperLite;
 import com.android.car.power.CarPowerManagementService;
 import com.android.car.user.InitialUserSetter.InitialUserInfo;
 import com.android.internal.annotations.GuardedBy;
diff --git a/service/src/com/android/car/user/InitialUserSetter.java b/service/src/com/android/car/user/InitialUserSetter.java
index c5a9493a66..5a82468b4f 100644
--- a/service/src/com/android/car/user/InitialUserSetter.java
+++ b/service/src/com/android/car/user/InitialUserSetter.java
@@ -39,7 +39,7 @@ import android.util.Pair;
 import android.util.Slog;
 import android.util.TimingsTraceLog;
 
-import com.android.car.internal.UserHelperLite;
+import com.android.car.internal.common.UserHelperLite;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.Preconditions;
 import com.android.internal.widget.LockPatternUtils;
diff --git a/service/src/com/android/car/user/UserPreCreator.java b/service/src/com/android/car/user/UserPreCreator.java
index 52d5380c04..f217f5d70a 100644
--- a/service/src/com/android/car/user/UserPreCreator.java
+++ b/service/src/com/android/car/user/UserPreCreator.java
@@ -25,7 +25,7 @@ import android.util.EventLog;
 import android.util.Slog;
 import android.util.SparseBooleanArray;
 
-import com.android.car.internal.EventLogTags;
+import com.android.car.internal.common.EventLogTags;
 import com.android.internal.annotations.VisibleForTesting;
 
 import java.util.ArrayList;
diff --git a/tests/carservice_unit_test/Android.mk b/tests/carservice_unit_test/Android.mk
index 6244e8e96c..e6e1473b32 100644
--- a/tests/carservice_unit_test/Android.mk
+++ b/tests/carservice_unit_test/Android.mk
@@ -56,7 +56,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     androidx.test.ext.junit \
     androidx.test.rules \
     car-service-test-static-lib \
-    com.android.car.internal.all \
+    com.android.car.internal.common \
     com.android.car.internal.system \
     com.android.car.test.utils \
     frameworks-base-testutils \
diff --git a/tests/carservice_unit_test/src/android/car/userlib/UserHelperTest.java b/tests/carservice_unit_test/src/android/car/userlib/UserHelperTest.java
index 1bdf08a3f3..613c541df7 100644
--- a/tests/carservice_unit_test/src/android/car/userlib/UserHelperTest.java
+++ b/tests/carservice_unit_test/src/android/car/userlib/UserHelperTest.java
@@ -34,7 +34,7 @@ import android.os.UserManager;
 
 import androidx.test.InstrumentationRegistry;
 
-import com.android.car.internal.UserHelperLite;
+import com.android.car.internal.common.UserHelperLite;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java b/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java
index fa7cf7e96b..91f221707a 100644
--- a/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java
@@ -105,7 +105,7 @@ import android.util.SparseArray;
 import androidx.test.InstrumentationRegistry;
 
 import com.android.car.hal.UserHalService;
-import com.android.car.internal.UserHelperLite;
+import com.android.car.internal.common.UserHelperLite;
 import com.android.internal.R;
 import com.android.internal.infra.AndroidFuture;
 import com.android.internal.os.IResultReceiver;
diff --git a/user/car-user-lib/Android.bp b/user/car-user-lib/Android.bp
index d0337e62d8..c2cf323d59 100644
--- a/user/car-user-lib/Android.bp
+++ b/user/car-user-lib/Android.bp
@@ -20,7 +20,7 @@ java_library {
     libs: [
         "android.hardware.automotive.vehicle-V2.0-java",
         "android.car.settings",
-        "com.android.car.internal.all",
+        "com.android.car.internal.common",
     ],
     product_variables: {
         pdk: {
diff --git a/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java b/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
index af057927b9..68eb03db54 100644
--- a/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
+++ b/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
@@ -30,7 +30,7 @@ import android.provider.Settings;
 import android.sysprop.CarProperties;
 import android.util.Log;
 
-import com.android.car.internal.UserHelperLite;
+import com.android.car.internal.common.UserHelperLite;
 
 import com.google.android.collect.Sets;