Merge "Disallow Blank App Package Name on Q and Later" into qt-dev

libwvdrmengine/include_hidl/WVDrmFactory.h

@@ -43,8 +43,10 @@ struct WVDrmFactory : public IDrmFactory {
   static WVGenericCryptoInterface sOemCryptoInterface;
 
   static bool areSpoidsEnabled();
+  static bool isBlankAppPackageNameAllowed();
+  static int32_t firstApiLevel();
 
-  friend class WVDrmFactoryTest_CalculatesSpoidUseCorrectly_Test;
+  friend class WVDrmFactoryTestPeer;
 };
 
 extern "C" IDrmFactory* HIDL_FETCH_IDrmFactory(const char* name);

libwvdrmengine/src_hidl/WVDrmFactory.cpp

@@ -71,6 +71,13 @@ Return<void> WVDrmFactory::createPlugin(
     return Void();
   }
 
+  if (!isBlankAppPackageNameAllowed() && appPackageName.empty()) {
+    ALOGE("Widevine Drm HAL: Failed to create DRM Plugin, blank App Package "
+          "Name disallowed.");
+    _hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, plugin);
+    return Void();
+  }
+
   plugin = new WVDrmPlugin(getCDM(), appPackageName.c_str(),
                            &sOemCryptoInterface, areSpoidsEnabled());
   _hidl_cb(Status::OK, plugin);
@@ -78,6 +85,14 @@ Return<void> WVDrmFactory::createPlugin(
 }
 
 bool WVDrmFactory::areSpoidsEnabled() {
+  return firstApiLevel() >= 26;  // Android O
+}
+
+bool WVDrmFactory::isBlankAppPackageNameAllowed() {
+  return firstApiLevel() < 29;  // Android Q
+}
+
+int32_t WVDrmFactory::firstApiLevel() {
   // Check what this device's first API level was.
   int32_t firstApiLevel =
       android::base::GetIntProperty<int32_t>("ro.product.first_api_level", 0);
@@ -87,7 +102,7 @@ bool WVDrmFactory::areSpoidsEnabled() {
     firstApiLevel =
         android::base::GetIntProperty<int32_t>("ro.build.version.sdk", 0);
   }
-  return firstApiLevel >= 26;  // Android O
+  return firstApiLevel;
 }
 
 

libwvdrmengine/test/unit/WVDrmFactory_test.cpp

@@ -33,6 +33,12 @@ const uint8_t kUnknownUUID[16] = {
   0x08,0xBC,0xEF,0x32,0x34,0x1A,0x9A,0x26
 };
 
+class WVDrmFactoryTestPeer : public WVDrmFactory {
+ public:
+  using WVDrmFactory::areSpoidsEnabled;
+  using WVDrmFactory::isBlankAppPackageNameAllowed;
+};
+
 TEST(WVDrmFactoryTest, SupportsSupportedCryptoSchemes) {
   WVDrmFactory factory;
 
@@ -104,7 +110,7 @@ TEST(WVDrmFactoryTest, SupportsSupportedCryptoSchemeWithLevel) {
 }
 
 TEST(WVDrmFactoryTest, CalculatesSpoidUseCorrectly) {
-  WVDrmFactory factory;
+  WVDrmFactoryTestPeer factory;
 
   int32_t firstApiLevel =
       android::base::GetIntProperty<int32_t>("ro.product.first_api_level", 0);
@@ -120,6 +126,23 @@ TEST(WVDrmFactoryTest, CalculatesSpoidUseCorrectly) {
       "WVDrmFactory calculated a different SPOID state than expected.";
 }
 
+TEST(WVDrmFactoryTest, CalculatesBlankAppPackageNamePermissibilityCorrectly) {
+  WVDrmFactoryTestPeer factory;
+
+  int32_t firstApiLevel =
+      android::base::GetIntProperty<int32_t>("ro.product.first_api_level", 0);
+  if (firstApiLevel == 0) {
+    // First API Level is 0 on factory ROMs, but we can assume the current SDK
+    // version is the first if it's a factory ROM.
+    firstApiLevel =
+        android::base::GetIntProperty<int32_t>("ro.build.version.sdk", 0);
+  }
+  bool shouldAllow = (firstApiLevel < 29);  // Android Q
+
+  EXPECT_EQ(shouldAllow, factory.isBlankAppPackageNameAllowed()) <<
+      "WVDrmFactory calculated a different Blank App Package Name state than expected.";
+}
+
 }  // namespace widevine
 }  // namespace V1_2
 }  // namespace drm