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

Commit 80eb7c69 authored by Peter Wang's avatar Peter Wang Committed by yinxu
Browse files

[Telephony Mainline] Remove usages of IBinder's for classes that do not 

belong to Telephony

Bug: 142255256
Bug: 147703450
Change-Id: Ie53c379e40ce873474437f8130432ae5b1ad5ba2
Fix: 147703450
Test: Build
parent dd78b41e

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

+9 −33
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ 
package com.android.internal.telephony;



import android.annotation.NonNull;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.os.RemoteException;

import android.telephony.Annotation.DataFailureCause;

import android.telephony.Annotation.RadioPowerState;

import android.telephony.Annotation.SrvccState;
@@ -30,9 +28,7 @@ import android.telephony.CellInfo; 
import android.telephony.PhoneCapability;

import android.telephony.PreciseCallState;

import android.telephony.PreciseDataConnectionState;

import com.android.telephony.Rlog;

import android.telephony.ServiceState;

import android.telephony.TelephonyFrameworkInitializer;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyRegistryManager;

import android.telephony.data.ApnSetting;
@@ -40,6 +36,7 @@ import android.telephony.emergency.EmergencyNumber; 
import android.telephony.ims.ImsReasonInfo;



import com.android.internal.telephony.PhoneInternalInterface.DataActivityState;

import com.android.telephony.Rlog;



import java.util.List;
@@ -51,17 +48,10 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
    private static final String LOG_TAG = "DefaultPhoneNotifier";

    private static final boolean DBG = false; // STOPSHIP if true



    @UnsupportedAppUsage

    protected ITelephonyRegistry mRegistry;

    private TelephonyRegistryManager mTelephonyRegistryMgr;





    public DefaultPhoneNotifier(Context context) {

        mRegistry = ITelephonyRegistry.Stub.asInterface(

                TelephonyFrameworkInitializer

                        .getTelephonyServiceManager()

                        .getTelephonyRegistryServiceRegisterer()

                        .get());

        mTelephonyRegistryMgr = (TelephonyRegistryManager) context.getSystemService(

            Context.TELEPHONY_REGISTRY_SERVICE);

    }
@@ -85,8 +75,8 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
        int phoneId = sender.getPhoneId();

        int subId = sender.getSubId();



        Rlog.d(LOG_TAG, "notifyServiceState: mRegistry=" + mRegistry + " ss=" + ss

            + " sender=" + sender + " phondId=" + phoneId + " subId=" + subId);

        Rlog.d(LOG_TAG, "notifyServiceState: mRegistryMgr=" + mTelephonyRegistryMgr + " ss="

                + ss + " sender=" + sender + " phondId=" + phoneId + " subId=" + subId);

        if (ss == null) {

            ss = new ServiceState();

            ss.setStateOutOfService();
@@ -100,7 +90,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
        int subId = sender.getSubId();

        if (DBG) {

            // too chatty to log constantly

            Rlog.d(LOG_TAG, "notifySignalStrength: mRegistry=" + mRegistry

            Rlog.d(LOG_TAG, "notifySignalStrength: mRegistryMgr=" + mTelephonyRegistryMgr

                + " ss=" + sender.getSignalStrength() + " sender=" + sender);

        }

        mTelephonyRegistryMgr.notifySignalStrengthChanged(subId, phoneId,
@@ -128,11 +118,9 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 
    @Override

    public void notifyDataActivity(Phone sender) {

        int subId = sender.getSubId();

        if (mRegistry != null) {

        mTelephonyRegistryMgr.notifyDataActivityChanged(subId,

                convertDataActivityState(sender.getDataActivityState()));

    }

    }



    @Override

    public void notifyDataConnection(
@@ -230,26 +218,14 @@ public class DefaultPhoneNotifier implements PhoneNotifier { 


    @Override

    public void notifyOutgoingEmergencyCall(Phone sender, EmergencyNumber emergencyNumber) {

        try {

            if (mRegistry != null) {

                mRegistry.notifyOutgoingEmergencyCall(sender.getPhoneId(), sender.getSubId(),

                        emergencyNumber);

            }

        } catch (RemoteException ex) {

            // system process is dead

        }

        mTelephonyRegistryMgr.notifyOutgoingEmergencyCall(

                sender.getPhoneId(), sender.getSubId(), emergencyNumber);

    }



    @Override

    public void notifyOutgoingEmergencySms(Phone sender, EmergencyNumber emergencyNumber) {

        try {

            if (mRegistry != null) {

                mRegistry.notifyOutgoingEmergencySms(sender.getPhoneId(), sender.getSubId(),

                        emergencyNumber);

            }

        } catch (RemoteException ex) {

            // system process is dead

        }

        mTelephonyRegistryMgr.notifyOutgoingEmergencySms(

                sender.getPhoneId(), sender.getSubId(), emergencyNumber);

    }



    @Override

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

+11 −23
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.graphics.BitmapFactory; 
import android.net.Uri;

import android.os.Binder;

import android.os.ParcelUuid;

import android.os.RemoteException;

import android.os.TelephonyServiceManager.ServiceRegisterer;

import android.os.UserHandle;

import android.provider.Settings;
@@ -48,6 +47,7 @@ import android.telephony.SubscriptionManager; 
import android.telephony.SubscriptionManager.SimDisplayNameSource;

import android.telephony.TelephonyFrameworkInitializer;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyRegistryManager;

import android.telephony.UiccAccessRule;

import android.telephony.UiccSlotInfo;

import android.telephony.euicc.EuiccManager;
@@ -277,17 +277,11 @@ public class SubscriptionController extends ISub.Stub { 
     */

    @UnsupportedAppUsage

    public void notifySubscriptionInfoChanged() {

        ITelephonyRegistry tr = ITelephonyRegistry.Stub.asInterface(

                TelephonyFrameworkInitializer

                        .getTelephonyServiceManager()

                        .getTelephonyRegistryServiceRegisterer()

                        .get());

        try {

        TelephonyRegistryManager trm =

                (TelephonyRegistryManager)

                        mContext.getSystemService(Context.TELEPHONY_REGISTRY_SERVICE);

        if (DBG) logd("notifySubscriptionInfoChanged:");

            tr.notifySubscriptionInfoChanged();

        } catch (RemoteException ex) {

            // Should never happen because its always available.

        }

        trm.notifySubscriptionInfoChanged();



        // FIXME: Remove if listener technique accepted.

        broadcastSimInfoContentChanged();
@@ -3726,17 +3720,11 @@ public class SubscriptionController extends ISub.Stub { 
    }



    private void notifyOpportunisticSubscriptionInfoChanged() {

        ITelephonyRegistry tr = ITelephonyRegistry.Stub.asInterface(

                TelephonyFrameworkInitializer

                        .getTelephonyServiceManager()

                        .getTelephonyRegistryServiceRegisterer()

                        .get());

        try {

        TelephonyRegistryManager trm =

                (TelephonyRegistryManager)

                        mContext.getSystemService(Context.TELEPHONY_REGISTRY_SERVICE);

        if (DBG) logd("notifyOpptSubscriptionInfoChanged:");

            tr.notifyOpportunisticSubscriptionInfoChanged();

        } catch (RemoteException ex) {

            // Should never happen because its always available.

        }

        trm.notifyOpportunisticSubscriptionInfoChanged();

    }



    private void refreshCachedOpportunisticSubscriptionInfoList() {

tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java

+8 −8
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ public class SubscriptionControllerTest extends TelephonyTest { 
    @SmallTest

    public void testOpptSubInfoListChanged() throws Exception {

        registerMockTelephonyRegistry();

        verify(mTelephonyRegisteryMock, times(0))

        verify(mTelephonyRegistryManager, times(0))

                .notifyOpportunisticSubscriptionInfoChanged();



        testInsertSim();
@@ -462,13 +462,13 @@ public class SubscriptionControllerTest extends TelephonyTest { 
                .getOpportunisticSubscriptions(mCallingPackage, mCallingFeature);



        assertTrue(opptSubList.isEmpty());

        verify(mTelephonyRegisteryMock, times(0))

        verify(mTelephonyRegistryManager, times(0))

                .notifyOpportunisticSubscriptionInfoChanged();



        // Setting sub2 as opportunistic should trigger callback.

        mSubscriptionControllerUT.setOpportunistic(true, 2, mCallingPackage);



        verify(mTelephonyRegisteryMock, times(1))

        verify(mTelephonyRegistryManager, times(1))

                .notifyOpportunisticSubscriptionInfoChanged();

        opptSubList = mSubscriptionControllerUT

                .getOpportunisticSubscriptions(mCallingPackage, mCallingFeature);
@@ -478,12 +478,12 @@ public class SubscriptionControllerTest extends TelephonyTest { 
        // Changing non-opportunistic sub1 shouldn't trigger callback.

        mSubscriptionControllerUT.setDisplayNameUsingSrc("DisplayName", 1,

                SubscriptionManager.NAME_SOURCE_SIM_SPN);

        verify(mTelephonyRegisteryMock, times(1))

        verify(mTelephonyRegistryManager, times(1))

                .notifyOpportunisticSubscriptionInfoChanged();



        mSubscriptionControllerUT.setDisplayNameUsingSrc("DisplayName", 2,

                SubscriptionManager.NAME_SOURCE_SIM_SPN);

        verify(mTelephonyRegisteryMock, times(2))

        verify(mTelephonyRegistryManager, times(2))

                .notifyOpportunisticSubscriptionInfoChanged();

    }
@@ -881,7 +881,7 @@ public class SubscriptionControllerTest extends TelephonyTest { 
        mSubscriptionControllerUT.refreshCachedActiveSubscriptionInfoList();

        mSubscriptionControllerUT.notifySubscriptionInfoChanged();



        verify(mTelephonyRegisteryMock, times(1))

        verify(mTelephonyRegistryManager, times(1))

                .notifyOpportunisticSubscriptionInfoChanged();



        // Set sub 1 and 2 into same group.
@@ -891,7 +891,7 @@ public class SubscriptionControllerTest extends TelephonyTest { 
        assertNotEquals(null, groupId);



        mSubscriptionControllerUT.notifySubscriptionInfoChanged();

        verify(mTelephonyRegisteryMock, times(2))

        verify(mTelephonyRegistryManager, times(2))

                .notifyOpportunisticSubscriptionInfoChanged();

        List<SubscriptionInfo> opptSubList = mSubscriptionControllerUT

                .getOpportunisticSubscriptions(mCallingPackage, mCallingFeature);
@@ -907,7 +907,7 @@ public class SubscriptionControllerTest extends TelephonyTest { 
        mSubscriptionControllerUT.refreshCachedActiveSubscriptionInfoList();

        mSubscriptionControllerUT.notifySubscriptionInfoChanged();



        verify(mTelephonyRegisteryMock, times(3))

        verify(mTelephonyRegistryManager, times(3))

                .notifyOpportunisticSubscriptionInfoChanged();

        opptSubList = mSubscriptionControllerUT.getOpportunisticSubscriptions(mCallingPackage,

                mCallingFeature);

tests/telephonytests/src/com/android/internal/telephony/TelephonyRegistryTest.java

+2 −5
Original line number Diff line number Diff line
@@ -33,12 +33,12 @@ import static org.mockito.Mockito.when; 


import android.content.Intent;

import android.net.LinkProperties;

import android.os.ServiceManager;

import android.telephony.Annotation;

import android.telephony.PhoneCapability;

import android.telephony.PhoneStateListener;

import android.telephony.PreciseDataConnectionState;

import android.telephony.SubscriptionInfo;

import android.telephony.TelephonyFrameworkInitializer;

import android.telephony.TelephonyManager;

import android.telephony.data.ApnSetting;

import android.test.suitebuilder.annotation.SmallTest;
@@ -112,10 +112,7 @@ public class TelephonyRegistryTest extends TelephonyTest { 
        mPhoneStateListener = new PhoneStateListenerWrapper();

        processAllMessages();

        assertEquals(mTelephonyRegistry.asBinder(),

                TelephonyFrameworkInitializer

                        .getTelephonyServiceManager()

                        .getTelephonyRegistryServiceRegisterer()

                        .get());

                ServiceManager.getService("telephony.registry"));

    }



    @After