Allow Secure Stops to be queried and deleted by application ID

This CL changes the WVDrmPlugin so that an application can segregate
its secure stops from those of other applications by setting an
application ID.

This CL is a merge of the following Widevine CLs:
https://widevine-internal-review.googlesource.com/#/c/11565/
Add getSecureStop by ssid

https://widevine-internal-review.googlesource.com/#/c/11572
Add getSecureStop by SSID and releaseAllSecureStops by app id.

https://widevine-internal-review.googlesource.com/#/c/11564/
Store Usage Info by App Id (device_file stubs)

https://widevine-internal-review.googlesource.com/#/c/11563/
Add application id to StoreUsageInfo.

https://widevine-internal-review.googlesource.com/#/c/11561/
Added Application ID to PropertySet for secure stop.

bug: 18053197
bug: 18076411
Change-Id: I5444baf67ba1b960dee2dc958bced8de82ab70a3

libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp

@@ -16,6 +16,7 @@
 #include "wv_cdm_types.h"
 #include "wv_content_decryption_module.h"
 #include "WVDrmPlugin.h"
+#include "WVErrors.h"
 
 using namespace android;
 using namespace std;
@@ -65,10 +66,17 @@ class MockCDM : public WvContentDecryptionModule {
   MOCK_METHOD3(HandleProvisioningResponse,
       CdmResponseType(CdmProvisioningResponse&, std::string*, std::string*));
 
-  MOCK_METHOD1(GetUsageInfo, CdmResponseType(CdmUsageInfo*));
+  MOCK_METHOD2(GetUsageInfo, CdmResponseType(const std::string&,
+                                             CdmUsageInfo*));
+
+  MOCK_METHOD3(GetUsageInfo, CdmResponseType(const std::string&,
+                                             const CdmSecureStopId&,
+                                             CdmUsageInfo*));
 
   MOCK_METHOD1(Unprovision, CdmResponseType(CdmSecurityLevel));
 
+  MOCK_METHOD1(ReleaseAllUsageInfo, CdmResponseType(const std::string&));
+
   MOCK_METHOD1(ReleaseUsageInfo,
       CdmResponseType(const CdmUsageInfoReleaseMessage&));
 
@@ -599,6 +607,8 @@ TEST_F(WVDrmPluginTest, GetsSecureStops) {
   StrictMock<MockCDM> cdm;
   StrictMock<MockCrypto> crypto;
   WVDrmPlugin plugin(&cdm, &crypto);
+  const char* app_id = "my_app_id";
+  plugin.setPropertyString(String8("appId"), String8(app_id));
 
   static const uint32_t kStopSize = 53;
   static const uint32_t kStopCount = 7;
@@ -614,8 +624,8 @@ TEST_F(WVDrmPluginTest, GetsSecureStops) {
     cdmStops.push_back(string(stopsRaw[i], stopsRaw[i] + kStopSize));
   }
 
-  EXPECT_CALL(cdm, GetUsageInfo(_))
-      .WillOnce(DoAll(SetArgPointee<0>(cdmStops),
+  EXPECT_CALL(cdm, GetUsageInfo(StrEq(app_id), _))
+      .WillOnce(DoAll(SetArgPointee<1>(cdmStops),
                       Return(wvcdm::NO_ERROR)));
 
   List<Vector<uint8_t> > stops;
@@ -637,6 +647,21 @@ TEST_F(WVDrmPluginTest, GetsSecureStops) {
   EXPECT_EQ(stops.end(), iter);
 }
 
+TEST_F(WVDrmPluginTest, ReleasesAllSecureStops) {
+  StrictMock<MockCDM> cdm;
+  StrictMock<MockCrypto> crypto;
+  WVDrmPlugin plugin(&cdm, &crypto);
+
+  status_t res = plugin.setPropertyString(String8("appId"), String8(""));
+  ASSERT_EQ(OK, res);
+
+  EXPECT_CALL(cdm, ReleaseAllUsageInfo(StrEq("")))
+      .Times(1);
+
+  res = plugin.releaseAllSecureStops();
+  ASSERT_EQ(OK, res);
+}
+
 TEST_F(WVDrmPluginTest, ReleasesSecureStops) {
   StrictMock<MockCDM> cdm;
   StrictMock<MockCrypto> crypto;
@@ -1309,6 +1334,59 @@ TEST_F(WVDrmPluginTest, ProvidesExpectedDefaultPropertiesToCdm) {
   EXPECT_EQ(0u, propertySet->service_certificate().size());
   EXPECT_FALSE(propertySet->is_session_sharing_enabled());
   EXPECT_EQ(0u, propertySet->session_sharing_id());
+  EXPECT_STREQ("", propertySet->app_id().c_str());
+}
+TEST_F(WVDrmPluginTest, CanSetAppId) {
+  StrictMock<MockCDM> cdm;
+  StrictMock<MockCrypto> crypto;
+  WVDrmPlugin plugin(&cdm, &crypto);
+
+  const CdmClientPropertySet* propertySet = NULL;
+
+  // Provide expected mock behavior
+  {
+    // Provide expected behavior in response to OpenSession and store the
+    // property set
+    EXPECT_CALL(cdm, OpenSession(_, _, _))
+        .WillRepeatedly(DoAll(SetArgPointee<2>(cdmSessionId),
+                        SaveArg<1>(&propertySet),
+                        Return(wvcdm::NO_ERROR)));
+
+    // Provide expected behavior when plugin requests session control info
+    EXPECT_CALL(cdm, QueryKeyControlInfo(cdmSessionId, _))
+        .WillRepeatedly(Invoke(setSessionIdOnMap<4>));
+
+    // Let gMock know these calls will happen but we aren't interested in them.
+    EXPECT_CALL(cdm, AttachEventListener(_, _))
+        .Times(AtLeast(0));
+
+    EXPECT_CALL(cdm, DetachEventListener(_, _))
+        .Times(AtLeast(0));
+
+    EXPECT_CALL(cdm, CloseSession(_))
+        .Times(AtLeast(0));
+  }
+
+  status_t res;
+
+  // Test setting an empty string
+  res = plugin.setPropertyString(String8("appId"), String8(""));
+  ASSERT_EQ(OK, res);
+
+  // Test setting an application id before a session is opened.
+  const String8 kAppId("com.unittest.mock.app.id");
+  res = plugin.setPropertyString(String8("appId"), kAppId);
+  ASSERT_EQ(OK, res);
+
+  plugin.openSession(sessionId);
+  ASSERT_THAT(propertySet, NotNull());
+
+  // Verify application id is set correctly.
+  EXPECT_STREQ(kAppId, propertySet->app_id().c_str());
+
+  // Test setting application id while session is opened, this should fail.
+  res = plugin.setPropertyString(String8("appId"), kAppId);
+  ASSERT_EQ(kErrorSessionIsOpen, res);
 }
 
 TEST_F(WVDrmPluginTest, CanSetSecurityLevel) {