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

Commit 0b46693a authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Renamed data/net service provider onDestroy to close" am: d6373866 am: 176904ab 

am: 079f4948

Change-Id: I184af57eab04a62a80d3080fb9ff2516c35fe727
parents 2557159d 079f4948

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

+2 −5
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.internal.telephony;



import android.annotation.CallSuper;

import android.hardware.radio.V1_0.CellInfoType;

import android.hardware.radio.V1_0.RegState;

import android.os.AsyncResult;
@@ -505,10 +504,8 @@ public class CellularNetworkService extends NetworkService { 
            }

        }



        @CallSuper

        protected void onDestroy() {

            super.onDestroy();



        @Override

        public void close() {

            mCallbackMap.clear();

            mHandlerThread.quit();

            mPhone.mCi.unregisterForNetworkStateChanged(mHandler);

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

+11 −3
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ public class CellularDataService extends DataService { 


        private final Handler mHandler;



        private final HandlerThread mHandlerThread;



        private final Phone mPhone;



        private CellularDataServiceProvider(int slotId) {
@@ -76,9 +78,9 @@ public class CellularDataService extends DataService { 


            mPhone = PhoneFactory.getPhone(getSlotId());



            HandlerThread thread = new HandlerThread(CellularDataService.class.getSimpleName());

            thread.start();

            mLooper = thread.getLooper();

            mHandlerThread = new HandlerThread(CellularDataService.class.getSimpleName());

            mHandlerThread.start();

            mLooper = mHandlerThread.getLooper();

            mHandler = new Handler(mLooper) {

                @Override

                public void handleMessage(Message message) {
@@ -219,6 +221,12 @@ public class CellularDataService extends DataService { 
            }

            mPhone.mCi.getDataCallList(message);

        }



        @Override

        public void close() {

            mPhone.mCi.unregisterForDataCallListChanged(mHandler);

            mHandlerThread.quit();

        }

    }



    @Override