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

Commit 41c28a3e authored by Sungsoo Lim's avatar Sungsoo Lim
Browse files

MediaBrowser: Support pagination of child media items 

Bug: 23289404, Bug: 25564520
Change-Id: I156d34735d6c00bca6f4d63fe754951febf552a5
parent 15f3d215

api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -21745,7 +21745,11 @@ package android.media.browse { 
    method public android.media.session.MediaSession.Token getSessionToken();

    method public boolean isConnected();

    method public void subscribe(java.lang.String, android.media.browse.MediaBrowser.SubscriptionCallback);

    method public void subscribe(java.lang.String, android.os.Bundle, android.media.browse.MediaBrowser.SubscriptionCallback);

    method public void unsubscribe(java.lang.String);

    method public void unsubscribe(java.lang.String, android.os.Bundle);

    field public static final java.lang.String EXTRA_PAGE = "android.media.browse.extra.PAGE";

    field public static final java.lang.String EXTRA_PAGE_SIZE = "android.media.browse.extra.PAGE_SIZE";

  }















  public static class MediaBrowser.ConnectionCallback {










@@ -21778,7 +21782,9 @@ package android.media.browse {













  public static abstract class MediaBrowser.SubscriptionCallback {















    ctor public MediaBrowser.SubscriptionCallback();















    method public void onChildrenLoaded(java.lang.String, java.util.List<android.media.browse.MediaBrowser.MediaItem>);













    method public void onChildrenLoaded(java.lang.String, java.util.List<android.media.browse.MediaBrowser.MediaItem>, android.os.Bundle);















    method public void onError(java.lang.String);













    method public void onError(java.lang.String, android.os.Bundle);















  }





























}










@@ -33784,9 +33790,11 @@ package android.service.media {













    method public void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);















    method public android.media.session.MediaSession.Token getSessionToken();















    method public void notifyChildrenChanged(java.lang.String);













    method public void notifyChildrenChanged(java.lang.String, android.os.Bundle);















    method public android.os.IBinder onBind(android.content.Intent);















    method public abstract android.service.media.MediaBrowserService.BrowserRoot onGetRoot(java.lang.String, int, android.os.Bundle);















    method public abstract void onLoadChildren(java.lang.String, android.service.media.MediaBrowserService.Result<java.util.List<android.media.browse.MediaBrowser.MediaItem>>);













    method public void onLoadChildren(java.lang.String, android.service.media.MediaBrowserService.Result<java.util.List<android.media.browse.MediaBrowser.MediaItem>>, android.os.Bundle);















    method public void onLoadItem(java.lang.String, android.service.media.MediaBrowserService.Result<android.media.browse.MediaBrowser.MediaItem>);















    method public void setSessionToken(android.media.session.MediaSession.Token);















    field public static final java.lang.String SERVICE_INTERFACE = "android.media.browse.MediaBrowserService";

























api/system-current.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -23162,7 +23162,11 @@ package android.media.browse {













    method public android.media.session.MediaSession.Token getSessionToken();















    method public boolean isConnected();















    method public void subscribe(java.lang.String, android.media.browse.MediaBrowser.SubscriptionCallback);













    method public void subscribe(java.lang.String, android.os.Bundle, android.media.browse.MediaBrowser.SubscriptionCallback);















    method public void unsubscribe(java.lang.String);













    method public void unsubscribe(java.lang.String, android.os.Bundle);













    field public static final java.lang.String EXTRA_PAGE = "android.media.browse.extra.PAGE";













    field public static final java.lang.String EXTRA_PAGE_SIZE = "android.media.browse.extra.PAGE_SIZE";















  }





























  public static class MediaBrowser.ConnectionCallback {










@@ -23195,7 +23199,9 @@ package android.media.browse {













  public static abstract class MediaBrowser.SubscriptionCallback {















    ctor public MediaBrowser.SubscriptionCallback();















    method public void onChildrenLoaded(java.lang.String, java.util.List<android.media.browse.MediaBrowser.MediaItem>);













    method public void onChildrenLoaded(java.lang.String, java.util.List<android.media.browse.MediaBrowser.MediaItem>, android.os.Bundle);















    method public void onError(java.lang.String);













    method public void onError(java.lang.String, android.os.Bundle);















  }





























}










@@ -36001,9 +36007,11 @@ package android.service.media {













    method public void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);















    method public android.media.session.MediaSession.Token getSessionToken();















    method public void notifyChildrenChanged(java.lang.String);













    method public void notifyChildrenChanged(java.lang.String, android.os.Bundle);















    method public android.os.IBinder onBind(android.content.Intent);















    method public abstract android.service.media.MediaBrowserService.BrowserRoot onGetRoot(java.lang.String, int, android.os.Bundle);















    method public abstract void onLoadChildren(java.lang.String, android.service.media.MediaBrowserService.Result<java.util.List<android.media.browse.MediaBrowser.MediaItem>>);













    method public void onLoadChildren(java.lang.String, android.service.media.MediaBrowserService.Result<java.util.List<android.media.browse.MediaBrowser.MediaItem>>, android.os.Bundle);















    method public void onLoadItem(java.lang.String, android.service.media.MediaBrowserService.Result<android.media.browse.MediaBrowser.MediaItem>);















    method public void setSessionToken(android.media.session.MediaSession.Token);















    field public static final java.lang.String SERVICE_INTERFACE = "android.media.browse.MediaBrowserService";

























api/test-current.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -21753,7 +21753,11 @@ package android.media.browse {













    method public android.media.session.MediaSession.Token getSessionToken();















    method public boolean isConnected();















    method public void subscribe(java.lang.String, android.media.browse.MediaBrowser.SubscriptionCallback);













    method public void subscribe(java.lang.String, android.os.Bundle, android.media.browse.MediaBrowser.SubscriptionCallback);















    method public void unsubscribe(java.lang.String);













    method public void unsubscribe(java.lang.String, android.os.Bundle);













    field public static final java.lang.String EXTRA_PAGE = "android.media.browse.extra.PAGE";













    field public static final java.lang.String EXTRA_PAGE_SIZE = "android.media.browse.extra.PAGE_SIZE";















  }





























  public static class MediaBrowser.ConnectionCallback {










@@ -21786,7 +21790,9 @@ package android.media.browse {













  public static abstract class MediaBrowser.SubscriptionCallback {















    ctor public MediaBrowser.SubscriptionCallback();















    method public void onChildrenLoaded(java.lang.String, java.util.List<android.media.browse.MediaBrowser.MediaItem>);













    method public void onChildrenLoaded(java.lang.String, java.util.List<android.media.browse.MediaBrowser.MediaItem>, android.os.Bundle);















    method public void onError(java.lang.String);













    method public void onError(java.lang.String, android.os.Bundle);















  }





























}










@@ -33798,9 +33804,11 @@ package android.service.media {













    method public void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);















    method public android.media.session.MediaSession.Token getSessionToken();















    method public void notifyChildrenChanged(java.lang.String);













    method public void notifyChildrenChanged(java.lang.String, android.os.Bundle);















    method public android.os.IBinder onBind(android.content.Intent);















    method public abstract android.service.media.MediaBrowserService.BrowserRoot onGetRoot(java.lang.String, int, android.os.Bundle);















    method public abstract void onLoadChildren(java.lang.String, android.service.media.MediaBrowserService.Result<java.util.List<android.media.browse.MediaBrowser.MediaItem>>);













    method public void onLoadChildren(java.lang.String, android.service.media.MediaBrowserService.Result<java.util.List<android.media.browse.MediaBrowser.MediaItem>>, android.os.Bundle);















    method public void onLoadItem(java.lang.String, android.service.media.MediaBrowserService.Result<android.media.browse.MediaBrowser.MediaItem>);















    method public void setSessionToken(android.media.session.MediaSession.Token);















    field public static final java.lang.String SERVICE_INTERFACE = "android.media.browse.MediaBrowserService";

























media/java/android/media/browse/MediaBrowser.java



+261
−71


























File changed.
Preview size limit exceeded, changes collapsed.
























media/java/android/media/browse/MediaBrowserUtils.java
0 → 100644



+72
−0




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2016 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.media.browse;



























import android.os.Bundle;



























/**













 * @hide













 */













public class MediaBrowserUtils {













    public static boolean areSameOptions(Bundle options1, Bundle options2) {













        if (options1 == options2) {













            return true;













        } else if (options1 == null) {













            return options2.getInt(MediaBrowser.EXTRA_PAGE, -1) == -1













                    && options2.getInt(MediaBrowser.EXTRA_PAGE_SIZE, -1) == -1;













        } else if (options2 == null) {













            return options1.getInt(MediaBrowser.EXTRA_PAGE, -1) == -1













                    && options1.getInt(MediaBrowser.EXTRA_PAGE_SIZE, -1) == -1;













        } else {













            return options1.getInt(MediaBrowser.EXTRA_PAGE, -1)













                    == options2.getInt(MediaBrowser.EXTRA_PAGE, -1)













                    && options1.getInt(MediaBrowser.EXTRA_PAGE_SIZE, -1)













                    == options2.getInt(MediaBrowser.EXTRA_PAGE_SIZE, -1);













        }













    }



























    public static boolean hasDuplicatedItems(Bundle options1, Bundle options2) {













        int page1 = options1.getInt(MediaBrowser.EXTRA_PAGE, -1);













        int page2 = options2.getInt(MediaBrowser.EXTRA_PAGE, -1);













        int pageSize1 = options1.getInt(MediaBrowser.EXTRA_PAGE_SIZE, -1);













        int pageSize2 = options2.getInt(MediaBrowser.EXTRA_PAGE_SIZE, -1);



























        int startIndex1, startIndex2, endIndex1, endIndex2;













        if (page1 == -1 || pageSize1 == -1) {













            startIndex1 = 0;













            endIndex1 = Integer.MAX_VALUE;













        } else {













            startIndex1 = pageSize1 * (page1 - 1);













            endIndex1 = startIndex1 + pageSize1 - 1;













        }



























        if (page2 == -1 || pageSize2 == -1) {













            startIndex2 = 0;













            endIndex2 = Integer.MAX_VALUE;













        } else {













            startIndex2 = pageSize2 * (page2 - 1);













            endIndex2 = startIndex2 + pageSize2 - 1;













        }



























        if (startIndex1 <= startIndex2 && startIndex2 <= endIndex1) {













            return true;













        } else if (startIndex1 <= endIndex2 && endIndex2 <= endIndex1) {













            return true;













        }













        return false;













    }













}