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

Commit 429b7af5 authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Revert "Revert "Remove ServiceException from registerForNtnSigna..." 

Revert submission 25983712-revert-25876830-306111250-BHXJGNVBIV

Reason for revert: Fixed revert reason from ag/25993875 

Reverted changes: /q/submissionid:25983712-revert-25876830-306111250-BHXJGNVBIV

Change-Id: I522f195695d93c47ecf2eda70ab363961decd39a
parent 3a7891b2

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+1 −1
Original line number Diff line number Diff line
@@ -1998,7 +1998,7 @@ public class SatelliteController extends Handler { 
        if (error == SATELLITE_RESULT_SUCCESS) {

            mNtnSignalStrengthChangedListeners.put(callback.asBinder(), callback);

        } else {

            throw new ServiceSpecificException(error);

            throw new RemoteException(new IllegalStateException("registration fails: " + error));

        }

    }

tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ import android.os.Message; 
import android.os.PersistableBundle;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.ServiceSpecificException;

import android.telephony.CarrierConfigManager;

import android.telephony.Rlog;

import android.telephony.ServiceState;
@@ -3190,10 +3189,11 @@ public class SatelliteControllerTest extends TelephonyTest { 
                throw new AssertionError();

            }

        } else {

            ServiceSpecificException ex = assertThrows(ServiceSpecificException.class,

            RemoteException ex = assertThrows(RemoteException.class,

                    () -> mSatelliteControllerUT.registerForNtnSignalStrengthChanged(subId,

                            callback));

            assertEquals(expectedError, ex.errorCode);

            assertTrue("The cause is not IllegalStateException",

                    ex.getCause() instanceof IllegalStateException);

        }

    }