From 1e8ca1d7d2c8002e7e92e753f5ac4a2ffb237a8b Mon Sep 17 00:00:00 2001
From: Kuan Wang <clairewang@google.com>
Date: Fri, 2 Dec 2022 15:00:58 +0800
Subject: [PATCH] Move fuelgauge_usage_state.proto into fuelgauge folder.

Test: make RunSettingsRoboTests + manual
Bug: 20424125
Change-Id: Id0ed25e06258764ec58263c2e2f7dec7bfd81c0a
---
 protos/Android.bp                                |  8 --------
 .../android/settings/fuelgauge/protos/Android.bp | 16 ++++++++++++++++
 .../protos}/fuelgauge_usage_state.proto          |  1 -
 3 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 src/com/android/settings/fuelgauge/protos/Android.bp
 rename {protos => src/com/android/settings/fuelgauge/protos}/fuelgauge_usage_state.proto (96%)

diff --git a/protos/Android.bp b/protos/Android.bp
index 26b1ec8dab8..d546e2db7fe 100644
--- a/protos/Android.bp
+++ b/protos/Android.bp
@@ -41,11 +41,3 @@ java_library {
     },
     srcs: ["fuelgauge_log.proto"],
 }
-
-java_library {
-    name: "fuelgauge-usage-state-protos-lite",
-    proto: {
-        type: "lite",
-    },
-    srcs: ["fuelgauge_usage_state.proto"],
-}
diff --git a/src/com/android/settings/fuelgauge/protos/Android.bp b/src/com/android/settings/fuelgauge/protos/Android.bp
new file mode 100644
index 00000000000..ab5e36b3b27
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/protos/Android.bp
@@ -0,0 +1,16 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
+java_library {
+    name: "fuelgauge-usage-state-protos-lite",
+    proto: {
+        type: "lite",
+    },
+    srcs: ["fuelgauge_usage_state.proto"],
+}
\ No newline at end of file
diff --git a/protos/fuelgauge_usage_state.proto b/src/com/android/settings/fuelgauge/protos/fuelgauge_usage_state.proto
similarity index 96%
rename from protos/fuelgauge_usage_state.proto
rename to src/com/android/settings/fuelgauge/protos/fuelgauge_usage_state.proto
index cd112ea0082..813344b6b9f 100644
--- a/protos/fuelgauge_usage_state.proto
+++ b/src/com/android/settings/fuelgauge/protos/fuelgauge_usage_state.proto
@@ -1,6 +1,5 @@
 syntax = "proto2";
 
-package com.android.settings.intelligence;
 option java_multiple_files = true;
 option java_package = "com.android.settings.fuelgauge.batteryusage";
 option java_outer_classname = "FuelgaugeUsageStateProto";