Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaBrowserUtils: Fix NPE"

Browse Source
This commit is contained in:
Sungsoo Lim
2016-02-02 02:23:11 +00:00
committed by Android (Google) Code Review
parent 086e09ff60 a24ca36ce1
commit bc89bd2056
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/browse/MediaBrowserUtils.java
View File

@@ -40,10 +40,10 @@ public class MediaBrowserUtils {
}
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 page1 = options1 == null ? -1 : options1.getInt(MediaBrowser.EXTRA_PAGE, -1);
int page2 = options2 == null ? -1 : options2.getInt(MediaBrowser.EXTRA_PAGE, -1);
int pageSize1 = options1 == null ? -1 : options1.getInt(MediaBrowser.EXTRA_PAGE_SIZE, -1);
int pageSize2 = options2 == null ? -1 : options2.getInt(MediaBrowser.EXTRA_PAGE_SIZE, -1);
int startIndex1, startIndex2, endIndex1, endIndex2;
if (page1 == -1 || pageSize1 == -1) {