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

Commit 22184c1b authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Move permission grant to bind instead of complete 

We need to grant the package the correct permissions
before the service is bound to prevent race conditions
where the ImsService needs permissions in initialization.

Bug: 76102874
Test: Manual
Merged-In: I643de1a525b3c9d9832190d28703c56db81c5104
Change-Id: I7eafd91407998ecbe823bc7a69e52b58de1e32f7
parent 497b6f86

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

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

                mIsBound = true;

                mIsBinding = false;

                grantPermissionsToService();

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

                        + service);

                if (service != null) {
@@ -345,6 +344,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();