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

Commit a1303e01 authored by Romain Guy's avatar Romain Guy
Browse files

Calling super.finalize() in finalize() methods. 

Also cleanup code, mostly removing unused handlers and casts.
parent 582ae172

telephony/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java

+2 −6
Original line number Diff line number Diff line
@@ -22,10 +22,7 @@ import android.os.Handler; 
import android.os.Looper;

import android.os.Message;

import android.os.ServiceManager;

import android.telephony.PhoneNumberUtils;

import android.util.Log;



import java.util.ArrayList;

import java.util.List;



/**
@@ -37,7 +34,7 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub { 


    protected PhoneBase phone;

    protected AdnRecordCache adnCache;

    protected Object mLock = new Object();

    protected final Object mLock = new Object();

    protected int recordSize[];

    protected boolean success;

    protected List<AdnRecord> records;
@@ -80,8 +77,7 @@ public abstract class IccPhoneBookInterfaceManager extends IIccPhoneBook.Stub { 
                    ar = (AsyncResult)msg.obj;

                    synchronized (mLock) {

                        if (ar.exception == null) {

                            records = (List<AdnRecord>)

                                    ((ArrayList<AdnRecord>) ar.result);

                            records = (List<AdnRecord>) ar.result;

                        } else {

                            if(DBG) logd("Cannot load ADN records");

                            if (records != null) {

telephony/java/com/android/internal/telephony/PhoneSubInfo.java

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ public class PhoneSubInfo extends IPhoneSubInfo.Stub { 
    }



    protected void finalize() {

        try {

            super.finalize();

        } catch (Throwable throwable) {

            Log.e(LOG_TAG, "Error while finalizing:", throwable);

        }

        Log.d(LOG_TAG, "PhoneSubInfo finalized");

    }

telephony/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java

+5 −26
Original line number Diff line number Diff line
@@ -16,22 +16,10 @@ 


package com.android.internal.telephony.cdma;



import android.content.pm.PackageManager;

import android.os.AsyncResult;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.ServiceManager;

import android.telephony.PhoneNumberUtils;

import android.util.Log;



import com.android.internal.telephony.AdnRecord;

import com.android.internal.telephony.AdnRecordCache;

import com.android.internal.telephony.IccPhoneBookInterfaceManager;

import com.android.internal.telephony.PhoneProxy;



import java.util.ArrayList;

import java.util.List;



/**

 * RuimPhoneBookInterfaceManager to provide an inter-process communication to
@@ -42,20 +30,6 @@ import java.util.List; 
public class RuimPhoneBookInterfaceManager extends IccPhoneBookInterfaceManager {

    static final String LOG_TAG = "CDMA";





    Handler mHandler = new Handler() {

        @Override

        public void handleMessage(Message msg) {

            AsyncResult ar;



            switch(msg.what) {

                default:

                    mBaseHandler.handleMessage(msg);

                    break;

            }

        }

    };



    public RuimPhoneBookInterfaceManager(CDMAPhone phone) {

        super(phone);

        adnCache = phone.mRuimRecords.getAdnCache();
@@ -67,6 +41,11 @@ public class RuimPhoneBookInterfaceManager extends IccPhoneBookInterfaceManager 
    }



    protected void finalize() {

        try {

            super.finalize();

        } catch (Throwable throwable) {

            Log.e(LOG_TAG, "Error while finalizing:", throwable);

        }

        if(DBG) Log.d(LOG_TAG, "RuimPhoneBookInterfaceManager finalized");

    }

telephony/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java

+7 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.internal.telephony.PhoneProxy; 
import com.android.internal.telephony.SmsRawData;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



import static android.telephony.SmsManager.STATUS_ON_ICC_FREE;
@@ -89,6 +90,11 @@ public class RuimSmsInterfaceManager extends IccSmsInterfaceManager { 
    }



    protected void finalize() {

        try {

            super.finalize();

        } catch (Throwable throwable) {

            Log.e(LOG_TAG, "Error while finalizing:", throwable);

        }

        if(DBG) Log.d(LOG_TAG, "RuimSmsInterfaceManager finalized");

    }
@@ -143,7 +149,7 @@ public class RuimSmsInterfaceManager extends IccSmsInterfaceManager { 
    public boolean copyMessageToIccEf(int status, byte[] pdu, byte[] smsc) {

        //NOTE smsc not used in RUIM

        if (DBG) log("copyMessageToIccEf: status=" + status + " ==> " +

                "pdu=("+ pdu + ")");

                "pdu=("+ Arrays.toString(pdu) + ")");

        enforceReceiveAndSend("Copying message to RUIM");

        synchronized(mLock) {

            mSuccess = false;

telephony/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java

+5 −26
Original line number Diff line number Diff line
@@ -16,22 +16,10 @@ 


package com.android.internal.telephony.gsm;



import android.content.pm.PackageManager;

import android.os.AsyncResult;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.ServiceManager;

import android.telephony.PhoneNumberUtils;

import android.util.Log;



import com.android.internal.telephony.AdnRecord;

import com.android.internal.telephony.AdnRecordCache;

import com.android.internal.telephony.IccPhoneBookInterfaceManager;

import com.android.internal.telephony.PhoneProxy;



import java.util.ArrayList;

import java.util.List;



/**

 * SimPhoneBookInterfaceManager to provide an inter-process communication to
@@ -42,20 +30,6 @@ import java.util.List; 
public class SimPhoneBookInterfaceManager extends IccPhoneBookInterfaceManager {

    static final String LOG_TAG = "GSM";





    Handler mHandler = new Handler() {

        @Override

        public void handleMessage(Message msg) {

            AsyncResult ar;



            switch(msg.what) {

                default:

                    mBaseHandler.handleMessage(msg);

                    break;

            }

        }

    };



    public SimPhoneBookInterfaceManager(GSMPhone phone) {

        super(phone);

        adnCache = phone.mSIMRecords.getAdnCache();
@@ -67,6 +41,11 @@ public class SimPhoneBookInterfaceManager extends IccPhoneBookInterfaceManager { 
    }



    protected void finalize() {

        try {

            super.finalize();

        } catch (Throwable throwable) {

            Log.e(LOG_TAG, "Error while finalizing:", throwable);

        }

        if(DBG) Log.d(LOG_TAG, "SimPhoneBookInterfaceManager finalized");

    }