Merge "Add nullable and nonnull annotations"

  public abstract class CellBroadcastService extends android.app.Service {

    ctor public CellBroadcastService();

    method @CallSuper public android.os.IBinder onBind(android.content.Intent);

    method public abstract void onCdmaCellBroadcastSms(int, byte[]);

    method public abstract void onGsmCellBroadcastSms(int, byte[]);

    method @CallSuper @NonNull public android.os.IBinder onBind(@Nullable android.content.Intent);

    method public abstract void onCdmaCellBroadcastSms(int, @NonNull byte[]);

    method public abstract void onGsmCellBroadcastSms(int, @NonNull byte[]);

    field public static final String CELL_BROADCAST_SERVICE_INTERFACE = "android.telephony.CellBroadcastService";

  }

package android.telephony;

import android.annotation.CallSuper;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.app.Service;

import android.content.Intent;

     * @param slotIndex the index of the slot which received the message

     * @param message the SMS PDU

     */

    public abstract void onGsmCellBroadcastSms(int slotIndex, byte[] message);

    public abstract void onGsmCellBroadcastSms(int slotIndex, @NonNull byte[] message);

    /**

     * Handle a CDMA cell broadcast SMS message forwarded from the system.

     * @param slotIndex the index of the slot which received the message

     * @param message the SMS PDU

     */

    public abstract void onCdmaCellBroadcastSms(int slotIndex, byte[] message);

    public abstract void onCdmaCellBroadcastSms(int slotIndex, @NonNull byte[] message);

    /**

     * If overriding this method, call through to the super method for any unknown actions.

     */

    @Override

    @CallSuper

    public IBinder onBind(Intent intent) {

    @NonNull

    public IBinder onBind(@Nullable Intent intent) {

        return mStubWrapper;

    }