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

Commit 3a7891b2 authored by PODISHETTY KUMAR's avatar PODISHETTY KUMAR Committed by Android (Google) Code Review
Browse files

Revert "Remove ServiceException from registerForNtnSignalStreang..." 

Revert submission 25876830-306111250

Reason for revert: <Reason for revert: Potential culprit for b/322132989  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Reverted changes: /q/submissionid:25876830-306111250

Change-Id: Iffac4fd27e9efbd24aae3027332365b2c0e1e454
parent 73451241

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 RemoteException(new IllegalStateException("registration fails: " + error));

            throw new ServiceSpecificException(error);

        }

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ 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;
@@ -3189,11 +3190,10 @@ public class SatelliteControllerTest extends TelephonyTest { 
                throw new AssertionError();

            }

        } else {

            RemoteException ex = assertThrows(RemoteException.class,

            ServiceSpecificException ex = assertThrows(ServiceSpecificException.class,

                    () -> mSatelliteControllerUT.registerForNtnSignalStrengthChanged(subId,

                            callback));

            assertTrue("The cause is not IllegalStateException",

                    ex.getCause() instanceof IllegalStateException);

            assertEquals(expectedError, ex.errorCode);

        }

    }