commit ab7ac8d5a04bd3f38b85ce20ae5bb382f2a26585
author Jeff Sharkey <jsharkey@android.com> Wed Mar 08 12:39:46 2017 -0700
committer Jeff Sharkey <jsharkey@android.com> Wed Mar 08 12:39:51 2017 -0700
tree 6e4ed7d565ffdf3182f3570fd2b76e0a016fb9d4
parent d86505e9ac91e0f0bbc381659f70cb1f7cb3176c

Allow "android" package name.

Test: /data/nativetest64/installd_utils_test/installd_utils_test
Bug: 36062649
Change-Id: I9b41a34822a1a194d256f5b99d5955e51716029c

cmds/installd/tests/installd_utils_test.cpp

diff --git a/cmds/installd/tests/installd_utils_test.cpp b/cmds/installd/tests/installd_utils_test.cpp
index 6a8755e..93a1458 100644
--- a/cmds/installd/tests/installd_utils_test.cpp
+++ b/cmds/installd/tests/installd_utils_test.cpp
@@ -334,19 +334,6 @@
              << "Package path should be a really long string of a's";
 }
 
-TEST_F(UtilsTest, CreatePkgPath_LongPkgNameFail) {
-    char path[PKG_PATH_MAX];
-
-    // Create long packagename of "aaaaa..."
-    size_t pkgnameSize = PKG_NAME_MAX + 1;
-    char pkgname[pkgnameSize + 1];
-    memset(pkgname, 'a', pkgnameSize);
-    pkgname[pkgnameSize] = '\0';
-
-    EXPECT_EQ(-1, create_pkg_path(path, pkgname, "", 0))
-            << "Should return error because package name is too long.";
-}
-
 TEST_F(UtilsTest, CreatePkgPath_LongPostfixFail) {
     char path[PKG_PATH_MAX];
 
@@ -514,6 +501,7 @@
 }
 
 TEST_F(UtilsTest, IsValidPackageName) {
+    EXPECT_EQ(true, is_valid_package_name("android"));
     EXPECT_EQ(true, is_valid_package_name("com.example"));
     EXPECT_EQ(true, is_valid_package_name("com.example-1"));
     EXPECT_EQ(true, is_valid_package_name("com.example-1024"));
@@ -522,9 +510,10 @@
 
     EXPECT_EQ(false, is_valid_package_name("1234.package"));
     EXPECT_EQ(false, is_valid_package_name("com.1234.package"));
-    EXPECT_EQ(false, is_valid_package_name("package"));
     EXPECT_EQ(false, is_valid_package_name(""));
     EXPECT_EQ(false, is_valid_package_name("."));
+    EXPECT_EQ(false, is_valid_package_name(".."));
+    EXPECT_EQ(false, is_valid_package_name("../"));
     EXPECT_EQ(false, is_valid_package_name("com.example/../com.evil/"));
     EXPECT_EQ(false, is_valid_package_name("com.example-1/../com.evil/"));
     EXPECT_EQ(false, is_valid_package_name("/com.evil"));