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

Commit 51b3661b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Adds permission granting to ImsResolver"

parents f7d420da 054de658

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

+8 −9
Original line number Original line Diff line number Diff line
@@ -332,15 +332,14 @@ public class ImsServiceController { 
    private void grantPermissionsToService() {

    private void grantPermissionsToService() {

        Log.i(LOG_TAG, "Granting Runtime permissions to:" + getComponentName());

        Log.i(LOG_TAG, "Granting Runtime permissions to:" + getComponentName());

        String[] pkgToGrant = {mComponentName.getPackageName()};

        String[] pkgToGrant = {mComponentName.getPackageName()};

        // Uncommented once changes to PackageManager go in (ims_resolver_3_3)

        try {

//        try {

            if (mPackageManager != null) {

//            if (mPackageManager != null) {

                mPackageManager.grantDefaultPermissionsToEnabledImsServices(pkgToGrant,

//                mPackageManager.grantDefaultPermissionsToEnabledImsServices(pkgToGrant,

                        mContext.getUserId());

//                        mContext.getUserId());

            }

//            }

        } catch (RemoteException e) {

//        } catch (RemoteException e) {

            Log.w(LOG_TAG, "Unable to grant permissions, binder died.");

//            Log.w(LOG_TAG, "Unable to grant permissions, binder died.");

        }

//        }

    }

    }





    private void sendImsFeatureCreatedCallback(int slot, int feature) {

    private void sendImsFeatureCreatedCallback(int slot, int feature) {