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

Commit 6490b20a authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Automerger Merge Worker
Browse files

Merge "Upgrade RadioIndication to 1.5" am: 25f7e359 

Change-Id: If72e8cb7a32162d8c59580d6d90fc2545852d3df
parents 84f9ec56 25f7e359

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

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ import android.hardware.radio.V1_0.SsInfoData; 
import android.hardware.radio.V1_0.StkCcUnsolSsResult;

import android.hardware.radio.V1_0.SuppSvcNotification;

import android.hardware.radio.V1_2.CellConnectionStatus;

import android.hardware.radio.V1_4.IRadioIndication;

import android.hardware.radio.V1_5.IRadioIndication;

import android.os.AsyncResult;

import android.sysprop.TelephonyProperties;

import android.telephony.Annotation.RadioPowerState;
@@ -1022,7 +1022,7 @@ public class RadioIndication extends IRadioIndication.Stub { 
     */

    public void barringInfoChanged(int indicationType,

            android.hardware.radio.V1_5.CellIdentity cellIdentity,

            List<android.hardware.radio.V1_5.BarringInfo> barringInfos) {

            ArrayList<android.hardware.radio.V1_5.BarringInfo> barringInfos) {

        mRil.processIndication(indicationType);



        CellIdentity ci = CellIdentity.create(cellIdentity);