Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add nullable and nonnull annotations"

Browse Source 
am: 6e7e6c5b5a

Change-Id: I0aa589f6f114d78475bec65b0cabdb04ca435843
This commit is contained in:
Jordan Liu
2019-11-01 14:24:26 -07:00
committed by android-build-merger
parent ddf65ce0d6 6e7e6c5b5a
commit bb2ad91ecb
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/system-current.txt
View File

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

9
telephony/java/android/telephony/CellBroadcastService.java
View File

@@ -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;
}