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

Commit bb2ad91e authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Add nullable and nonnull annotations" 

am: 6e7e6c5b

Change-Id: I0aa589f6f114d78475bec65b0cabdb04ca435843
parents ddf65ce0 6e7e6c5b

api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -7246,9 +7246,9 @@ package android.telephony { 














  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";















  }















































telephony/java/android/telephony/CellBroadcastService.java



+6
−3




























Original line number
Diff line number
Diff line








@@ -17,6 +17,8 @@













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;










@@ -64,14 +66,14 @@ public abstract class CellBroadcastService extends Service {













     * @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.









@@ -79,7 +81,8 @@ public abstract class CellBroadcastService extends Service {













     */















    @Override















    @CallSuper













    public IBinder onBind(Intent intent) {













    @NonNull













    public IBinder onBind(@Nullable Intent intent) {















        return mStubWrapper;















    }