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

Commit 0b8a0fa9 authored by Jack Yu's avatar Jack Yu
Browse files

Fixed crash in data service 

Test: telephony sanity tests
Bug: 123598340
Change-Id: Ie15f8869849a2aed4a32f4f6731abd5ba1eb05cd
parent cf2e0699

telephony/java/android/telephony/NetworkService.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

            }

telephony/java/android/telephony/data/DataService.java

+14 −4
Original line number Diff line number Diff line
@@ -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,8 +179,10 @@ public abstract class DataService extends Service { 
        public void deactivateDataCall(int cid, @DeactivateDataReason int reason,

                                       @Nullable DataServiceCallback callback) {

            // The default implementation is to return unsupported.

            if (callback != null) {

                callback.onDeactivateDataCallComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED);

            }

        }



        /**

         * Set an APN to initial attach network.
@@ -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,8 +214,10 @@ public abstract class DataService extends Service { 
        public void setDataProfile(List<DataProfile> dps, boolean isRoaming,

                                   @Nullable DataServiceCallback callback) {

            // The default implementation is to return unsupported.

            if (callback != null) {

                callback.onSetDataProfileComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED);

            }

        }



        /**

         * Get the active data call list.