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

Commit 4022f625 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move permission grant to bind instead of complete" into pi-dev

parents 3eaf0106 22184c1b

src/java/com/android/internal/telephony/ims/ImsServiceController.java

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ public class ImsServiceController { 
            synchronized (mLock) {

                mIsBound = true;

                mIsBinding = false;

                grantPermissionsToService();

                Log.d(LOG_TAG, "ImsService(" + name + "): onServiceConnected with binder: "

                        + service);

                if (service != null) {
@@ -346,6 +345,7 @@ public class ImsServiceController { 
            if (!mIsBound && !mIsBinding) {

                mIsBinding = true;

                mImsFeatures = imsFeatureSet;

                grantPermissionsToService();

                Intent imsServiceIntent = new Intent(getServiceInterface()).setComponent(

                        mComponentName);

                mImsServiceConnection = new ImsServiceConnection();

tests/telephonytests/src/com/android/internal/telephony/ims/ImsResolverTest.java

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ public class ImsResolverTest extends ImsTestBase { 
        features.add(ImsResolver.METADATA_MMTEL_FEATURE);

        features.add(ImsResolver.METADATA_RCS_FEATURE);

        setupPackageQuery(TEST_DEVICE_DEFAULT_NAME, features, true);

        setupController();



        // Complete package manager lookup and cache.

        startBind();