Fix typo in power policy nameandroid12L-dev

Fix typo in initial_on power policy name.
Add tests to validate that default policies exist.

Bug: 241939390
Test: atest PolicyReaderUnitTest PolicyManagerTest

Merged-In: I0c60a75c35e18da15598406ca076a540dbdae01a
Change-Id: I0c60a75c35e18da15598406ca076a540dbdae01a
(cherry picked from commit ac6ad9eb382c6a29c5509bccd755030074452dd3)

3 files changed, 12 insertions, 9 deletions

diff --git a/cpp/powerpolicy/server/src/PolicyManager.cpp b/cpp/powerpolicy/server/src/PolicyManager.cpp
index 95e8b7d289..a8d9200e11 100644
--- a/cpp/powerpolicy/server/src/PolicyManager.cpp
+++ b/cpp/powerpolicy/server/src/PolicyManager.cpp
@@ -627,8 +627,8 @@ void PolicyManager::initPreemptivePowerPolicy() {
                                      createPolicy(kSystemPolicyIdNoUserInteraction,
                                                   kNoUserInteractionEnabledComponents,
                                                   kNoUserInteractionDisabledComponents));
-    mPreemptivePowerPolicies.emplace(kSystemPolicyIdSuspendToRam,
-                                     createPolicy(kSystemPolicyIdSuspendToRam, kNoComponents,
+    mPreemptivePowerPolicies.emplace(kSystemPolicyIdSuspendPrep,
+                                     createPolicy(kSystemPolicyIdSuspendPrep, kNoComponents,
                                                   kSuspendToRamDisabledComponents));
 }
 
diff --git a/cpp/powerpolicy/server/src/PolicyManager.h b/cpp/powerpolicy/server/src/PolicyManager.h
index b0a092ab5c..9a20e22b50 100644
--- a/cpp/powerpolicy/server/src/PolicyManager.h
+++ b/cpp/powerpolicy/server/src/PolicyManager.h
@@ -39,10 +39,10 @@ bool isSystemPowerPolicy(const std::string& policyId);
 using CarPowerPolicyPtr = std::shared_ptr<CarPowerPolicy>;
 using PolicyGroup = std::unordered_map<int32_t, std::string>;
 
-constexpr const char* kSystemPolicyIdNoUserInteraction = "system_power_policy_no_user_interaction";
-constexpr const char* kSystemPolicyIdAllOn = "system_power_policy_all_on";
-constexpr const char* kSystemPolicyIdInitialOn = "system_power_policy_initiall_on";
-constexpr const char* kSystemPolicyIdSuspendToRam = "system_power_policy_suspend_to_ram";
+constexpr const char kSystemPolicyIdNoUserInteraction[] = "system_power_policy_no_user_interaction";
+constexpr const char kSystemPolicyIdAllOn[] = "system_power_policy_all_on";
+constexpr const char kSystemPolicyIdInitialOn[] = "system_power_policy_initial_on";
+constexpr const char kSystemPolicyIdSuspendPrep[] = "system_power_policy_suspend_prep";
 
 // Forward declaration for testing use only.
 namespace internal {
diff --git a/cpp/powerpolicy/server/tests/PolicyManagerTest.cpp b/cpp/powerpolicy/server/tests/PolicyManagerTest.cpp
index 2ca26655dc..8017434df9 100644
--- a/cpp/powerpolicy/server/tests/PolicyManagerTest.cpp
+++ b/cpp/powerpolicy/server/tests/PolicyManagerTest.cpp
@@ -31,7 +31,7 @@ using android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateReport;
 using tinyxml2::XML_SUCCESS;
 using tinyxml2::XMLDocument;
 
-namespace {
+namespace test {
 
 constexpr const char* kDirPrefix = "/tests/data/";
 
@@ -225,7 +225,7 @@ void assertDefaultPolicies(const PolicyManager& policyManager) {
     ASSERT_TRUE(policyManager.getPowerPolicy(kSystemPolicyIdInitialAllOn).ok());
 }
 
-}  // namespace
+}  // namespace test
 
 namespace internal {
 
@@ -242,7 +242,7 @@ public:
 private:
     void readXmlFile(const char* filename) {
         XMLDocument xmlDoc;
-        std::string path = getTestDataPath(filename);
+        std::string path = test::getTestDataPath(filename);
         xmlDoc.LoadFile(path.c_str());
         ASSERT_TRUE(xmlDoc.ErrorID() == XML_SUCCESS);
         mManager->readPowerPolicyFromXml(xmlDoc);
@@ -254,6 +254,8 @@ private:
 
 }  // namespace internal
 
+namespace test {
+
 class PolicyManagerTest : public ::testing::Test {};
 
 TEST_F(PolicyManagerTest, TestValidXml_PowerPolicy) {
@@ -417,6 +419,7 @@ TEST_F(PolicyManagerTest, TestSystemPowerPolicyAllOn) {
     ASSERT_TRUE(systemPolicyDefault->disabledComponents.empty());
 }
 
+}  // namespace test
 }  // namespace powerpolicy
 }  // namespace automotive
 }  // namespace frameworks