Merge "Remove unused APIs from telephony-ext"
diff --git a/internal/src/org/codeaurora/internal/IDsda.aidl b/internal/src/org/codeaurora/internal/IDsda.aidl
deleted file mode 100644
index f688d89..0000000
--- a/internal/src/org/codeaurora/internal/IDsda.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) 2016 The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of The Linux Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.codeaurora.internal;
-
-/**
- * Interface for DSDA API, to be called from telephony-fwk and they will
- * be handled in service/telecom.
- *
- * {@hide}
- */
-interface IDsda{
- void switchToActiveSub(int subId);
- int getActiveSubscription();
-}
diff --git a/internal/src/org/codeaurora/internal/IExtTelephony.aidl b/internal/src/org/codeaurora/internal/IExtTelephony.aidl
old mode 100755
new mode 100644
index 8acd53b..e9961fa
--- a/internal/src/org/codeaurora/internal/IExtTelephony.aidl
+++ b/internal/src/org/codeaurora/internal/IExtTelephony.aidl
@@ -30,9 +30,6 @@
package org.codeaurora.internal;
-import org.codeaurora.internal.IDepersoResCallback;
-import org.codeaurora.internal.IDsda;
-
import org.codeaurora.internal.SignalStrength;
import org.codeaurora.internal.Status;
import org.codeaurora.internal.Token;
@@ -63,20 +60,6 @@
int getCurrentUiccCardProvisioningStatus(int slotId);
/**
- * Returns the user preferred Uicc card provision status.
- * @param slotId user preferred slotId.
- * @return User preference value as integer, below are
- * possible return values.
- * '0' - returned if Uicc Card is not provisioned.
- * '1' - returned if Uicc Card provisioned.
- * '-1'- returned if there is an error @ below layers OR
- * if framework does not received info from Modem yet.
- * '-2' returned when SIM card is not present in slot.
- * Requires Permission: android.Manifest.permission.READ_PHONE_STATE
- */
- int getUiccCardProvisioningUserPreference(int slotId);
-
- /**
* Activates the Uicc card.
* @param slotId user preferred slotId.
* @return Uicc card activation result as Integer, below are
@@ -135,13 +118,6 @@
void setPrimaryCardOnSlot(int slotId);
/**
- * Check is FDN is enabled or not.
- * @param - void
- * @return true or false
- */
- boolean isFdnEnabled();
-
- /**
* Check if get the icc file handler from specific application family sucessfully
* @param slotId user preferred slotId.
* @param family UICC application family.
@@ -170,68 +146,6 @@
boolean writeEfToIcc(int slotId, int family, int efId, in byte[] efData);
/**
- * Get primary stack phone id.
- * @param - void
- * @return phone id
- */
- int getPrimaryStackPhoneId();
-
- /* Send local call hold request to RIL.
- * @param subId, send request on this subscription
- * @param enable
- * true - to enable local call hold
- * false - to disable local call hold
- * @return true or false
- */
- boolean setLocalCallHold(int subId, boolean enable);
-
- /**
- * Send switch to other subscription.
- * @param subId, send request on this subscription
- * @return void
- */
- void switchToActiveSub(int subId);
-
- /**
- * set adapter, so that IExtTelephony would have interface to send requests to service/telecom
- * @param dsdaAdapter, this adapter used by IExtTelephony as interface for requests in IDsda.
- * @return void
- */
- void setDsdaAdapter(in IDsda dsdaAdapter);
-
- /**
- * get active subscription.
- * @param void
- * @return subId of active subscription.
- */
- int getActiveSubscription();
-
- /**
- * returns device is in DSDA configuration or not.
- * @param void
- * @return true or false
- */
- boolean isDsdaEnabled();
-
- /**
- * supply pin to unlock sim locked on network.
- * @param - netpin - network pin to unlock the sim.
- * @param - type - PersoSubState for which the sim is locked onto.
- * @param - callback - callback to notify UI, whether the request was success or failure.
- * @param - phoneId - slot id on which the pin request is sent.
- * @return void
- */
- void supplyIccDepersonalization(String netpin, String type, in IDepersoResCallback callback,
- int phoneId);
-
- /**
- * Returns ID of the slot in which PrimaryCarrier SIM card is present.
- * If none of the slots contains PrimaryCarrier SIM, this would return '-1'
- * Supported values: 0, 1, -1
- */
- int getPrimaryCarrierSlotId();
-
- /**
* Check if slotId has PrimaryCarrier SIM card present or not.
* @param - slotId
* @return true or false
@@ -239,22 +153,6 @@
boolean isPrimaryCarrierSlotId(int slotId);
/**
- * Change SMSC address based on slotId.
- * @param - slotId
- * @param - SMSC address
- * @return true or false
- */
- boolean setSmscAddress(int slotId, String smsc);
-
- /**
- * Get SMSC address based on slotId.
- * @param - slotId
- * @param - SMSC address
- * @return SMSC address or null
- */
- String getSmscAddress(int slotId);
-
- /**
* Perform incremental scan using QCRIL hooks.
* @param - slotId
* Range: 0 <= slotId < {@link TelephonyManager#getActiveModemCount()}
@@ -280,13 +178,6 @@
boolean isVendorApkAvailable(String packageName);
/**
- * Get current primary card slot Id.
- * @param - void
- * @return slot index
- */
- int getCurrentPrimaryCardSlotId();
-
- /**
* Async api
* @deprecated
*/