Merge "Merge "Add Nullable to MediaHTTPService's mCookies." am: 7955aec0ea am:... (dc823928) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaHTTPService.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.media;

		import android.annotation.Nullable;
		import android.os.IBinder;
		import android.util.Log;

		@@ -28,10 +29,10 @@ import java.util.List;
		/** @hide */
		public class MediaHTTPService extends IMediaHTTPService.Stub {
		private static final String TAG = "MediaHTTPService";
		private List<HttpCookie> mCookies;
		@Nullable private List<HttpCookie> mCookies;
		private Boolean mCookieStoreInitialized = new Boolean(false);

		public MediaHTTPService(List<HttpCookie> cookies) {
		public MediaHTTPService(@Nullable List<HttpCookie> cookies) {
		mCookies = cookies;
		Log.v(TAG, "MediaHTTPService(" + this + "): Cookies: " + cookies);
		}