commit a24ca36ce1e6423ee0a7880479d4e5cc79a2766f
author Sungsoo Lim <sungsoo@google.com> Tue Feb 02 10:42:47 2016 +0900
committer Sungsoo Lim <sungsoo@google.com> Tue Feb 02 11:22:11 2016 +0900
tree 96d6cc348bbefff0062fadcc616690d36e228be4
parent f812e57d384710ff4d538a3cd76e5782b4c1e9a5

MediaBrowserUtils: Fix NPE

Bug: 26910471
Change-Id: I134516f6318c34cc5dfdcf04438e6ba00b843607

media/java/android/media/browse/MediaBrowserUtils.java

diff --git a/media/java/android/media/browse/MediaBrowserUtils.java b/media/java/android/media/browse/MediaBrowserUtils.java
index 4f198ac..b06e598 100644
--- a/media/java/android/media/browse/MediaBrowserUtils.java
+++ b/media/java/android/media/browse/MediaBrowserUtils.java
@@ -40,10 +40,10 @@
     }
 
     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) {