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

Commit 9e0c3e98 authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge changes from topic "ContextAPI" 

* changes:
  Revert registerReceiver change until bug fixed
  replace hidden Context APIs
parents a11a7ae5 eec71772

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

+9 −1
Original line number Diff line number Diff line
@@ -129,9 +129,15 @@ public class CarrierServiceBindHelper { 


        mPackageMonitor.register(

                context, mHandler.getLooper(), UserHandle.ALL, false /* externalStorage */);

        mContext.registerReceiverAsUser(mUserUnlockedReceiver, UserHandle.SYSTEM,

        try {

            Context contextAsUser = mContext.createPackageContextAsUser(mContext.getPackageName(),

                0, UserHandle.SYSTEM);

            contextAsUser.registerReceiver(mUserUnlockedReceiver,

                new IntentFilter(Intent.ACTION_USER_UNLOCKED), null /* broadcastPermission */,

                mHandler);

        } catch (PackageManager.NameNotFoundException e) {

            loge("Package name not found: " + e.getMessage());

        }

    }



    // Create or dispose mBindings and mLastSimState objects.
@@ -424,6 +430,8 @@ public class CarrierServiceBindHelper { 
        Log.d(LOG_TAG, message);

    }



    private static void loge(String message) { Log.e(LOG_TAG, message); }



    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println("CarrierServiceBindHelper:");

        for (int i = 0; i < mBindings.size(); i++) {

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

+9 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.ServiceConnection;

import android.content.pm.PackageManager;

import android.os.AsyncResult;

import android.os.Handler;

import android.os.IBinder;
@@ -99,8 +100,14 @@ public class NetworkRegistrationManager extends Handler { 


        IntentFilter intentFilter = new IntentFilter();

        intentFilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        phone.getContext().registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL,

                intentFilter, null, null);

        try {

            Context contextAsUser = phone.getContext().createPackageContextAsUser(

                    phone.getContext().getPackageName(), 0, UserHandle.ALL);

            contextAsUser.registerReceiver(mBroadcastReceiver, intentFilter,

                    null /* broadcastPermission */, null);

        } catch (PackageManager.NameNotFoundException e) {

            loge("Package name not found: " + e.getMessage());

        }

        PhoneConfigurationManager.registerForMultiSimConfigChange(

                this, EVENT_BIND_NETWORK_SERVICE, null);

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

+9 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.os.PersistableBundle;

import android.os.UserHandle;

import android.telephony.AccessNetworkConstants;
@@ -83,8 +84,14 @@ public class RatRatcheter { 


        IntentFilter intentFilter = new IntentFilter();

        intentFilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        phone.getContext().registerReceiverAsUser(mConfigChangedReceiver, UserHandle.ALL,

                intentFilter, null, null);

        try {

            Context contextAsUser = phone.getContext().createPackageContextAsUser(

                phone.getContext().getPackageName(), 0, UserHandle.ALL);

            contextAsUser.registerReceiver(mConfigChangedReceiver,

                intentFilter, null /* broadcastPermission */, null);

        } catch (PackageManager.NameNotFoundException e) {

            Rlog.e(LOG_TAG, "Package name not found: " + e.getMessage());

        }

        resetRatFamilyMap();

    }

src/java/com/android/internal/telephony/dataconnection/AccessNetworksManager.java

+9 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.ServiceConnection;

import android.content.pm.PackageManager;

import android.os.Handler;

import android.os.IBinder;

import android.os.Message;
@@ -212,8 +213,14 @@ public class AccessNetworksManager extends Handler { 


        IntentFilter intentFilter = new IntentFilter();

        intentFilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        phone.getContext().registerReceiverAsUser(mConfigChangedReceiver, UserHandle.ALL,

                intentFilter, null, null);

        try {

            Context contextAsUser = phone.getContext().createPackageContextAsUser(

                phone.getContext().getPackageName(), 0, UserHandle.ALL);

            contextAsUser.registerReceiver(mConfigChangedReceiver, intentFilter,

                null /* broadcastPermission */, null);

        } catch (PackageManager.NameNotFoundException e) {

            Rlog.e(TAG, "Package name not found: " + e.getMessage());

        }

        sendEmptyMessage(EVENT_BIND_QUALIFIED_NETWORKS_SERVICE);

    }

src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java

+12 −6
Original line number Diff line number Diff line
@@ -133,9 +133,9 @@ public class DataServiceManager extends Handler { 
        final String[] pkgToGrant = {packageName};

        try {

            mPackageManager.grantDefaultPermissionsToEnabledTelephonyDataServices(

                    pkgToGrant, mPhone.getContext().getUserId());

                    pkgToGrant, UserHandle.myUserId());

            mAppOps.setMode(AppOpsManager.OPSTR_MANAGE_IPSEC_TUNNELS,

                mPhone.getContext().getUserId(), pkgToGrant[0], AppOpsManager.MODE_ALLOWED);

                UserHandle.myUserId(), pkgToGrant[0], AppOpsManager.MODE_ALLOWED);

        } catch (RemoteException e) {

            loge("Binder to package manager died, permission grant for DataService failed.");

            throw e.rethrowAsRuntimeException();
@@ -157,10 +157,9 @@ public class DataServiceManager extends Handler { 
            String[] dataServicesArray = new String[dataServices.size()];

            dataServices.toArray(dataServicesArray);

            mPackageManager.revokeDefaultPermissionsFromDisabledTelephonyDataServices(

                    dataServicesArray, mPhone.getContext().getUserId());

                    dataServicesArray, UserHandle.myUserId());

            for (String pkg : dataServices) {

                mAppOps.setMode(AppOpsManager.OPSTR_MANAGE_IPSEC_TUNNELS,

                        mPhone.getContext().getUserId(),

                mAppOps.setMode(AppOpsManager.OPSTR_MANAGE_IPSEC_TUNNELS, UserHandle.myUserId(),

                        pkg, AppOpsManager.MODE_ERRORED);

            }

        } catch (RemoteException e) {
@@ -287,7 +286,14 @@ public class DataServiceManager extends Handler { 


        IntentFilter intentFilter = new IntentFilter();

        intentFilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);



        try {

            Context contextAsUser = phone.getContext().createPackageContextAsUser(

                    phone.getContext().getPackageName(), 0, UserHandle.ALL);

            contextAsUser.registerReceiver(mBroadcastReceiver, intentFilter,

                    null /* broadcastPermission */, null);

        } catch (PackageManager.NameNotFoundException e) {

            loge("Package name not found: " + e.getMessage());

        }

        PhoneConfigurationManager.registerForMultiSimConfigChange(

                this, EVENT_BIND_DATA_SERVICE, null);