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

Commit d8660494 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Removed the unnecessary invocation of binderDied" into sc-dev

parents fcd53c2d cab2e969

src/java/com/android/internal/telephony/NetworkRegistrationManager.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -202,7 +202,6 @@ public class NetworkRegistrationManager extends Handler { 
                        new NetworkRegStateCallback());

                        new NetworkRegStateCallback());

            } catch (RemoteException exception) {

            } catch (RemoteException exception) {

                // Remote exception means that the binder already died.

                // Remote exception means that the binder already died.

                mDeathRecipient.binderDied();

                logd("RemoteException " + exception);

                logd("RemoteException " + exception);

            }

            }

        }

        }

src/java/com/android/internal/telephony/dataconnection/AccessNetworksManager.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -194,7 +194,6 @@ public class AccessNetworksManager extends Handler { 
                registerDataThrottlersFirstTime();

                registerDataThrottlersFirstTime();





            } catch (RemoteException e) {

            } catch (RemoteException e) {

                mDeathRecipient.binderDied();

                loge("Remote exception. " + e);

                loge("Remote exception. " + e);

            }

            }

        }

        }

src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -222,6 +222,7 @@ public class DataServiceManager extends Handler { 
            mDeathRecipient = new DataServiceManagerDeathRecipient();

            mDeathRecipient = new DataServiceManagerDeathRecipient();

            mBound = true;

            mBound = true;

            mLastBoundPackageName = getDataServicePackageName();

            mLastBoundPackageName = getDataServicePackageName();

            removeMessages(EVENT_WATCHDOG_TIMEOUT);





            try {

            try {

                service.linkToDeath(mDeathRecipient, 0);

                service.linkToDeath(mDeathRecipient, 0);
@@ -231,11 +232,9 @@ public class DataServiceManager extends Handler { 
                mIDataService.registerForUnthrottleApn(mPhone.getPhoneId(),

                mIDataService.registerForUnthrottleApn(mPhone.getPhoneId(),

                        new CellularDataServiceCallback("unthrottleApn"));

                        new CellularDataServiceCallback("unthrottleApn"));

            } catch (RemoteException e) {

            } catch (RemoteException e) {

                mDeathRecipient.binderDied();

                loge("Remote exception. " + e);

                loge("Remote exception. " + e);

                return;

                return;

            }

            }

            removeMessages(EVENT_WATCHDOG_TIMEOUT);

            mServiceBindingChangedRegistrants.notifyResult(true);

            mServiceBindingChangedRegistrants.notifyResult(true);

        }

        }

        @Override

        @Override