Merge "Fix getSecureStop returns zero opaque data intermittently."

libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp

@@ -672,7 +672,9 @@ Return<void> WVDrmPlugin::getSecureStop(
     _hidl_cb(Status::BAD_VALUE, SecureStop());
     return Void();
   }
+
   const std::vector<uint8_t> id = toVector(secureStopId);
+  std::vector<uint8_t> cdmStopVec;
   SecureStop secureStop;
 
   CdmIdentifier identifier;
@@ -688,7 +690,6 @@ Return<void> WVDrmPlugin::getSecureStop(
       mPropertySet.app_id(), cdmSsId, identifier, &cdmUsageInfo);
 
   if (isCdmResponseTypeSuccess(res)) {
-    std::vector<uint8_t> cdmStopVec;
     for (CdmUsageInfo::const_iterator iter = cdmUsageInfo.begin();
          iter != cdmUsageInfo.end();
          ++iter) {