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

Commit 4f8c0a3d authored by Gerry Fan's avatar Gerry Fan Committed by android-build-merger
Browse files

Merge "Add Nullable to MediaHTTPService's mCookies." am: 7955aec0 am: 293800c9

am: d8a13d82

Change-Id: Ibde8fec798d965ac6a2ecaf297008f93439f1419
parents a55293d0 d8a13d82
Loading
Loading
Loading
Loading
+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);
    }