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

Commit c754a501 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge changes I513b7234,Ie3d05fcf 

* changes:
  cherry-pick of am 7cd40294: Merge change I2cb78a66 into eclair-mr2
  use a fixed value for public ID
parents f948ff81 e3d05fcf

api/current.xml

+1 −1
Original line number Diff line number Diff line
@@ -5689,7 +5689,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843446"

 value="16843447"

 static="true"

 final="true"

 deprecated="not deprecated"

core/java/android/provider/MediaStore.java

+22 −0
Original line number Diff line number Diff line
@@ -1251,6 +1251,28 @@ public final class MediaStore { 
                            + "/audio/playlists/" + playlistId + "/members");

                }



                /**

                 * Convenience method to move a playlist item to a new location

                 * @param res The content resolver to use

                 * @param playlistId The numeric id of the playlist

                 * @param from The position of the item to move

                 * @param to The position to move the item to

                 * @return true on success

                 * @hide

                 */

                public static final boolean moveItem(ContentResolver res,

                        long playlistId, int from, int to) {

                    Uri uri = MediaStore.Audio.Playlists.Members.getContentUri("external",

                            playlistId)

                            .buildUpon()

                            .appendEncodedPath(String.valueOf(from))

                            .appendQueryParameter("move", "true")

                            .build();

                    ContentValues values = new ContentValues();

                    values.put(MediaStore.Audio.Playlists.Members.PLAY_ORDER, to);

                    return res.update(uri, values, null, null) != 0;

                }



                /**

                 * The ID within the playlist.

                 */

core/res/res/values/public.xml

+1 −1
Original line number Diff line number Diff line
@@ -1227,6 +1227,6 @@ 
     Resources proposed for Flan.

     =============================================================== -->

  <eat-comment />

  <public type="attr" name="neverEncrypt" />

  <public type="attr" name="neverEncrypt" id="0x010102b7" />

    

</resources>