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

Commit 68cc1aef authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Reorder ImsFeature initialization to handle STATE_READY" into qt-dev 

am: af6f9339

Change-Id: I562246c1995365308d26f44683f75bf5c46b7405
parents 16ccf8a3 af6f9339

telephony/java/android/telephony/ims/ImsService.java

+1 −3
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ import android.util.SparseArray; 
import com.android.ims.internal.IImsFeatureStatusCallback;

import com.android.internal.annotations.VisibleForTesting;



import static android.Manifest.permission.MODIFY_PHONE_STATE;



/**

 * Main ImsService implementation, which binds via the Telephony ImsResolver. Services that extend

 * ImsService must register the service in their AndroidManifest to be detected by the framework.
@@ -229,8 +227,8 @@ public class ImsService extends Service { 


    private void setupFeature(ImsFeature f, int slotId, int featureType,

            IImsFeatureStatusCallback c) {

        f.addImsFeatureStatusCallback(c);

        f.initialize(this, slotId);

        f.addImsFeatureStatusCallback(c);

        addImsFeature(slotId, featureType, f);

    }