commit 696dc4d8df457d9321038f4b7c6f2c8f44f1ee0f
author Robert Shih <robertshih@google.com> Wed Apr 06 17:13:22 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 06 17:13:23 2016 +0000
tree a39f6add9f33fb7a4740400063ad52838b9e1dfc
parent 1667682d99af10ddae6e06524f7ad8deb993c288
parent 50cd766a57d7949e985c1a1d81976f202f0c2e72

Merge "DrmInitData: prevent public constructor access" into nyc-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 40a92b9..dfdff24 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -20073,7 +20073,6 @@
   }
 
   public abstract class DrmInitData {
-    ctor public DrmInitData();
     method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID);
   }
 

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 9ed529f..96b1e28 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -21552,7 +21552,6 @@
   }
 
   public abstract class DrmInitData {
-    ctor public DrmInitData();
     method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID);
   }
 

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index dea7fc1..8a745bf 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -20138,7 +20138,6 @@
   }
 
   public abstract class DrmInitData {
-    ctor public DrmInitData();
     method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID);
   }
 

media/java/android/media/DrmInitData.java

diff --git a/media/java/android/media/DrmInitData.java b/media/java/android/media/DrmInitData.java
index 06fe6ff..170d9de 100644
--- a/media/java/android/media/DrmInitData.java
+++ b/media/java/android/media/DrmInitData.java
@@ -28,6 +28,12 @@
 public abstract class DrmInitData {
 
     /**
+     * Prevent public constuctor access
+     */
+    /* package private */ DrmInitData() {
+    }
+
+    /**
      * Retrieves initialization data for a given DRM scheme, specified by its UUID.
      *
      * @param schemeUuid The DRM scheme's UUID.