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

Merge "Fixed crash in data service" am: 7fab753180

Browse Source 
am: ab5a5e8a58

Change-Id: I38fcae7f92de719ec49e3ecc4d630c0ec02b3e33
This commit is contained in:
Jack Yu
2019-01-30 17:19:24 -08:00
committed by android-build-merger
parent df46cd451f ab5a5e8a58
commit 5bc60320a6
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/android/telephony/NetworkService.java
View File

@@ -16,6 +16,7 @@
package android.telephony;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.app.Service;
import android.content.Intent;
@@ -112,13 +113,13 @@ public abstract class NetworkService extends Service {
mSlotId, 0, null).sendToTarget();
}
private void registerForStateChanged(INetworkServiceCallback callback) {
private void registerForStateChanged(@NonNull INetworkServiceCallback callback) {
synchronized (mNetworkRegistrationStateChangedCallbacks) {
mNetworkRegistrationStateChangedCallbacks.add(callback);
}
}
private void unregisterForStateChanged(INetworkServiceCallback callback) {
private void unregisterForStateChanged(@NonNull INetworkServiceCallback callback) {
synchronized (mNetworkRegistrationStateChangedCallbacks) {
mNetworkRegistrationStateChangedCallbacks.remove(callback);
}

18
telephony/java/android/telephony/data/DataService.java
View File

@@ -157,7 +157,10 @@ public abstract class DataService extends Service {
@Nullable LinkProperties linkProperties,
@Nullable DataServiceCallback callback) {
// The default implementation is to return unsupported.
callback.onSetupDataCallComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED, null);
if (callback != null) {
callback.onSetupDataCallComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED,
null);
}
}
/**
@@ -176,7 +179,9 @@ public abstract class DataService extends Service {
public void deactivateDataCall(int cid, @DeactivateDataReason int reason,
@Nullable DataServiceCallback callback) {
// The default implementation is to return unsupported.
callback.onDeactivateDataCallComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED);
if (callback != null) {
callback.onDeactivateDataCallComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED);
}
}
/**
@@ -190,7 +195,10 @@ public abstract class DataService extends Service {
public void setInitialAttachApn(DataProfile dataProfile, boolean isRoaming,
@Nullable DataServiceCallback callback) {
// The default implementation is to return unsupported.
callback.onSetInitialAttachApnComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED);
if (callback != null) {
callback.onSetInitialAttachApnComplete(
DataServiceCallback.RESULT_ERROR_UNSUPPORTED);
}
}
/**
@@ -206,7 +214,9 @@ public abstract class DataService extends Service {
public void setDataProfile(List<DataProfile> dps, boolean isRoaming,
@Nullable DataServiceCallback callback) {
// The default implementation is to return unsupported.
callback.onSetDataProfileComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED);
if (callback != null) {
callback.onSetDataProfileComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED);
}
}
/**