Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a80f0f6f authored by Paramananda Pradhan's avatar Paramananda Pradhan
Browse files

frameworks/base : Remove drm api entries from current.txt 

- To make current.txt unchanged, removed DRM related apis
  which are introduced on part of drm integration.
CRs-Fixed: 821176
Change-Id: I74d2fbed8a873bb066766151948fb7742ae17223
parent feba6ba3

api/current.txt

+3 −11
Original line number Diff line number Diff line
@@ -10172,14 +10172,6 @@ package android.drm { 
    field public static final java.lang.String REMAINING_REPEAT_COUNT = "remaining_repeat_count";

  }













  public static class DrmStore.DrmDeliveryType {













    ctor public DrmStore.DrmDeliveryType();













    field public static final int COMBINED_DELIVERY = 2; // 0x2













    field public static final int FORWARD_LOCK = 1; // 0x1













    field public static final int SEPARATE_DELIVERY = 3; // 0x3













    field public static final int SEPARATE_DELIVERY_FL = 4; // 0x4













  }



























  public static class DrmStore.DrmObjectType {















    ctor public deprecated DrmStore.DrmObjectType();















    field public static final int CONTENT = 1; // 0x1










@@ -15635,7 +15627,7 @@ package android.media {













    method public android.database.Cursor getCursor();















    method public static int getDefaultType(android.net.Uri);















    method public static android.net.Uri getDefaultUri(int);













    method public boolean getIncludeDrm();













    method public deprecated boolean getIncludeDrm();















    method public android.media.Ringtone getRingtone(int);















    method public static android.media.Ringtone getRingtone(android.content.Context, android.net.Uri);















    method public int getRingtonePosition(android.net.Uri);









@@ -15645,14 +15637,14 @@ package android.media {













    method public int inferStreamType();















    method public static boolean isDefault(android.net.Uri);















    method public static void setActualDefaultRingtoneUri(android.content.Context, int, android.net.Uri);













    method public void setIncludeDrm(boolean);













    method public deprecated void setIncludeDrm(boolean);















    method public void setStopPreviousRingtone(boolean);















    method public void setType(int);















    method public void stopPreviousRingtone();















    field public static final java.lang.String ACTION_RINGTONE_PICKER = "android.intent.action.RINGTONE_PICKER";















    field public static final java.lang.String EXTRA_RINGTONE_DEFAULT_URI = "android.intent.extra.ringtone.DEFAULT_URI";















    field public static final java.lang.String EXTRA_RINGTONE_EXISTING_URI = "android.intent.extra.ringtone.EXISTING_URI";













    field public static final java.lang.String EXTRA_RINGTONE_INCLUDE_DRM = "android.intent.extra.ringtone.INCLUDE_DRM";













    field public static final deprecated java.lang.String EXTRA_RINGTONE_INCLUDE_DRM = "android.intent.extra.ringtone.INCLUDE_DRM";















    field public static final java.lang.String EXTRA_RINGTONE_PICKED_URI = "android.intent.extra.ringtone.PICKED_URI";















    field public static final java.lang.String EXTRA_RINGTONE_SHOW_DEFAULT = "android.intent.extra.ringtone.SHOW_DEFAULT";















    field public static final java.lang.String EXTRA_RINGTONE_SHOW_SILENT = "android.intent.extra.ringtone.SHOW_SILENT";

























api/system-current.txt



+3
−11




























Original line number
Diff line number
Diff line








@@ -10478,14 +10478,6 @@ package android.drm {













    field public static final java.lang.String REMAINING_REPEAT_COUNT = "remaining_repeat_count";















  }



























  public static class DrmStore.DrmDeliveryType {













    ctor public DrmStore.DrmDeliveryType();













    field public static final int COMBINED_DELIVERY = 2; // 0x2













    field public static final int FORWARD_LOCK = 1; // 0x1













    field public static final int SEPARATE_DELIVERY = 3; // 0x3













    field public static final int SEPARATE_DELIVERY_FL = 4; // 0x4













  }



























  public static class DrmStore.DrmObjectType {















    ctor public deprecated DrmStore.DrmObjectType();















    field public static final int CONTENT = 1; // 0x1










@@ -16659,7 +16651,7 @@ package android.media {













    method public android.database.Cursor getCursor();















    method public static int getDefaultType(android.net.Uri);















    method public static android.net.Uri getDefaultUri(int);













    method public boolean getIncludeDrm();













    method public deprecated boolean getIncludeDrm();















    method public android.media.Ringtone getRingtone(int);















    method public static android.media.Ringtone getRingtone(android.content.Context, android.net.Uri);















    method public int getRingtonePosition(android.net.Uri);









@@ -16669,14 +16661,14 @@ package android.media {













    method public int inferStreamType();















    method public static boolean isDefault(android.net.Uri);















    method public static void setActualDefaultRingtoneUri(android.content.Context, int, android.net.Uri);













    method public void setIncludeDrm(boolean);













    method public deprecated void setIncludeDrm(boolean);















    method public void setStopPreviousRingtone(boolean);















    method public void setType(int);















    method public void stopPreviousRingtone();















    field public static final java.lang.String ACTION_RINGTONE_PICKER = "android.intent.action.RINGTONE_PICKER";















    field public static final java.lang.String EXTRA_RINGTONE_DEFAULT_URI = "android.intent.extra.ringtone.DEFAULT_URI";















    field public static final java.lang.String EXTRA_RINGTONE_EXISTING_URI = "android.intent.extra.ringtone.EXISTING_URI";













    field public static final java.lang.String EXTRA_RINGTONE_INCLUDE_DRM = "android.intent.extra.ringtone.INCLUDE_DRM";













    field public static final deprecated java.lang.String EXTRA_RINGTONE_INCLUDE_DRM = "android.intent.extra.ringtone.INCLUDE_DRM";















    field public static final java.lang.String EXTRA_RINGTONE_PICKED_URI = "android.intent.extra.ringtone.PICKED_URI";















    field public static final java.lang.String EXTRA_RINGTONE_SHOW_DEFAULT = "android.intent.extra.ringtone.SHOW_DEFAULT";















    field public static final java.lang.String EXTRA_RINGTONE_SHOW_SILENT = "android.intent.extra.ringtone.SHOW_SILENT";

























drm/java/android/drm/DrmStore.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -249,6 +249,7 @@ public class DrmStore {













    /**















     * Defines the drm delivery methods.















     * This should be in sync with svc_drm.h













     * @hide















     */















    public static class DrmDeliveryType {















        /**

































media/java/android/media/RingtoneManager.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -122,6 +122,7 @@ public class RingtoneManager {





























    /**















     * Given to the ringtone picker as a boolean. Whether to include DRM ringtones.













     * @deprecated DRM ringtones are no longer supported















     */















    public static final String EXTRA_RINGTONE_INCLUDE_DRM =















            "android.intent.extra.ringtone.INCLUDE_DRM";










@@ -347,6 +348,8 @@ public class RingtoneManager {













     * 















     * @return Whether DRM ringtones will be included.















     * @see #setIncludeDrm(boolean)













     * Obsolete - always returns false













     * @deprecated DRM ringtones are no longer supported















     */















    public boolean getIncludeDrm() {















        return mIncludeDrm;









@@ -356,6 +359,8 @@ public class RingtoneManager {













     * Sets whether to include DRM ringtones.















     * 















     * @param includeDrm Whether to include DRM ringtones.













     * Obsolete - no longer has any effect













     * @deprecated DRM ringtones are no longer supported















     */















    public void setIncludeDrm(boolean includeDrm) {















        mIncludeDrm = includeDrm;