Minor tweaks/fixes.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=113868179

library/src/main/java/com/google/android/exoplayer/dash/mpd/ContentProtection.java

@@ -70,8 +70,8 @@ public class ContentProtection {
   @Override
   @Override
   public int hashCode() {
   public int hashCode() {
     int hashCode = schemeUriId.hashCode();
     int hashCode = schemeUriId.hashCode();
-    hashCode = (37 * hashCode) + (uuid != null ? uuid.hashCode() : 0);
-    hashCode = (37 * hashCode) + (data != null ? data.hashCode() : 0);
+    hashCode = (31 * hashCode) + (uuid != null ? uuid.hashCode() : 0);
+    hashCode = (31 * hashCode) + (data != null ? data.hashCode() : 0);
     return hashCode;
     return hashCode;
   }
   }
 
 

library/src/main/java/com/google/android/exoplayer/upstream/Loader.java

@@ -206,8 +206,11 @@ public final class Loader {
         executorThread = Thread.currentThread();
         executorThread = Thread.currentThread();
         if (!loadable.isLoadCanceled()) {
         if (!loadable.isLoadCanceled()) {
           TraceUtil.beginSection(loadable.getClass().getSimpleName() + ".load()");
           TraceUtil.beginSection(loadable.getClass().getSimpleName() + ".load()");
-          loadable.load();
-          TraceUtil.endSection();
+          try {
+            loadable.load();
+          } finally {
+            TraceUtil.endSection();
+          }
         }
         }
         sendEmptyMessage(MSG_END_OF_SOURCE);
         sendEmptyMessage(MSG_END_OF_SOURCE);
       } catch (IOException e) {
       } catch (IOException e) {