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

2019-05-08 18:58:40 +00:00
parent 2f79fe2773 edccc13510
commit 8a0ba4d0fa
3 changed files with 43 additions and 3 deletions
--- a/libwvdrmengine/include_hidl/WVDrmFactory.h
+++ b/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);