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

Commit e8a8a7f4 authored by Adnan Begovic's avatar Adnan Begovic
Browse files

telephony: Move COLP definition to android settings. 

  Otherwise we pollute the bootclasspath with public cmsdk
  symbols.

  2) testBootClassPathIsClean(org.cyanogenmod.tests.versioning.unit.ClassPathTest)
java.lang.AssertionError: Jar file /system/framework/telephony-common.jar should not have cyanogenmod.alarmclock.ClockContract$AlarmsColumns !

Change-Id: I993897480a30ca40e9adca19deb36b13b4243a97
parent b4b65d24

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src/java) \ 
	$(call all-logtags-files-under, src/java)



LOCAL_JAVA_LIBRARIES := voip-common ims-common

LOCAL_STATIC_JAVA_LIBRARIES := org.cyanogenmod.platform.internal

LOCAL_REQUIRED_MODULES := telresources



ifneq ($(BOARD_RIL_CLASS),)

src/java/com/android/internal/telephony/gsm/GsmConnection.java

+3 −4
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.os.PersistableBundle; 
import android.os.PowerManager;

import android.os.Registrant;

import android.os.SystemClock;

import android.provider.Settings;

import android.telephony.CarrierConfigManager;

import android.telephony.DisconnectCause;

import android.telephony.Rlog;
@@ -36,8 +37,6 @@ import com.android.internal.telephony.uicc.UiccCardApplication; 
import com.android.internal.telephony.uicc.UiccController;

import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;



import cyanogenmod.providers.CMSettings;



/**

 * {@hide}

 */
@@ -602,8 +601,8 @@ public class GsmConnection extends Connection { 
        mCnapNamePresentation = dc.namePresentation;



        boolean connectedLineIdentification =

                CMSettings.System.getInt(mOwner.mPhone.getContext().getContentResolver(),

                        CMSettings.System.CONNECTED_LINE_IDENTIFICATION, 1) != 0;

                Settings.Global.getInt(mOwner.mPhone.getContext().getContentResolver(),

                        Settings.Global.CONNECTED_LINE_IDENTIFICATION, 1) != 0;

        if (mIsIncoming || connectedLineIdentification)

            mNumberPresentation = dc.numberPresentation;