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

Commit ed38bfdc authored by Ying Xu's avatar Ying Xu Committed by android-build-merger
Browse files

Merge "Use Bundle for inter-process message" into oc-dr1-dev am: e5ad3821 

am: c567b166

Change-Id: Icc35859aec67db25113cc7cb86fc3af75886c65b
parents cbbb27bc c567b166

telephony/java/android/telephony/TelephonyScanManager.java

+13 −1
Original line number Diff line number Diff line
@@ -20,15 +20,18 @@ import static com.android.internal.util.Preconditions.checkNotNull; 


import android.content.Context;

import android.os.Binder;

import android.os.Bundle;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.Looper;

import android.os.Message;

import android.os.Messenger;

import android.os.Parcelable;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.util.Log;

import android.util.SparseArray;

import java.util.Arrays;

import java.util.List;



import com.android.internal.telephony.ITelephony;
@@ -41,6 +44,9 @@ public final class TelephonyScanManager { 


    private static final String TAG = "TelephonyScanManager";



    /** @hide */

    public static final String SCAN_RESULT_KEY = "scanResult";



    /** @hide */

    public static final int CALLBACK_SCAN_RESULTS = 1;

    /** @hide */
@@ -112,7 +118,13 @@ public final class TelephonyScanManager { 
                switch (message.what) {

                    case CALLBACK_SCAN_RESULTS:

                        try {

                            callback.onResults((List<CellInfo>) message.obj);

                            final Bundle b = message.getData();

                            final Parcelable[] parcelables = b.getParcelableArray(SCAN_RESULT_KEY);

                            CellInfo[] ci = new CellInfo[parcelables.length];

                            for (int i = 0; i < parcelables.length; i++) {

                                ci[i] = (CellInfo) parcelables[i];

                            }

                            callback.onResults((List<CellInfo>) Arrays.asList(ci));

                        } catch (Exception e) {

                            Rlog.e(TAG, "Exception in networkscan callback onResults", e);

                        }