diff options
| author | Yabin Huang <yabinh@google.com> | 2019-10-28 15:25:13 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-28 15:25:13 -0700 |
| commit | d7e44c969dba5c94b0eece416ae9c9bf85db0117 (patch) | |
| tree | 391ed2487cf60af65562b5bfe75749b7ff787bbf | |
| parent | 9177482eb8ccf80b3b3be80859e76c4968e9f45c (diff) | |
| parent | 6750490ced1c39fe9d9521f5f1fbfd529893d4ee (diff) | |
| download | tests-d7e44c969dba5c94b0eece416ae9c9bf85db0117.tar.gz | |
Merge "Fix null rootHints" into pi-car-dev am: edde009ba8 am: 0afb93c444 am: 7706c78b25
am: 6750490ced
Change-Id: I468d0fd21458e92f77d97b5e2a4c356d644aec71
| -rw-r--r-- | TestMediaApp/src/com/android/car/media/testmediaapp/TmaBrowser.java | 4 | ||||
| -rw-r--r-- | TestMediaApp/src/com/android/car/media/testmediaapp/phone/TmaLauncherActivity.java | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaBrowser.java b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaBrowser.java index 6aeac39..079ab3b 100644 --- a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaBrowser.java +++ b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaBrowser.java @@ -152,6 +152,10 @@ public class TmaBrowser extends MediaBrowserServiceCompat { @Override public BrowserRoot onGetRoot( @NonNull String clientPackageName, int clientUid, Bundle rootHints) { + if (rootHints == null) { + Log.e(TAG, "Client " + clientPackageName + " didn't set rootHints."); + throw new NullPointerException("rootHints is null"); + } Log.i(TAG, "onGetroot client: " + clientPackageName + " EXTRA_MEDIA_ART_SIZE_HINT_PIXELS: " + rootHints.getInt(MediaKeys.EXTRA_MEDIA_ART_SIZE_HINT_PIXELS, 0)); return mRoot; diff --git a/TestMediaApp/src/com/android/car/media/testmediaapp/phone/TmaLauncherActivity.java b/TestMediaApp/src/com/android/car/media/testmediaapp/phone/TmaLauncherActivity.java index e38defa..2727ae4 100644 --- a/TestMediaApp/src/com/android/car/media/testmediaapp/phone/TmaLauncherActivity.java +++ b/TestMediaApp/src/com/android/car/media/testmediaapp/phone/TmaLauncherActivity.java @@ -11,6 +11,7 @@ import android.util.Log; import androidx.appcompat.app.AppCompatActivity; +import com.android.car.media.testmediaapp.MediaKeys; import com.android.car.media.testmediaapp.TmaBrowser; import com.android.car.media.testmediaapp.prefs.TmaPrefsActivity; import com.android.car.media.testmediaapp.R; @@ -38,9 +39,11 @@ public class TmaLauncherActivity extends AppCompatActivity { startActivity(prefsIntent); }); - + Bundle rootHints = new Bundle(); + // TODO: 256 is just a placeholder. We'd better find a proper value. + rootHints.putInt(MediaKeys.EXTRA_MEDIA_ART_SIZE_HINT_PIXELS, 256); mediaBrowser = new MediaBrowserCompat(this, new ComponentName(this, TmaBrowser.class), - mConnectionCallbacks, null); + mConnectionCallbacks, rootHints); } private final MediaBrowserCompat.ConnectionCallback mConnectionCallbacks = |