Revert "Clean up SubMgr#getOpportunisticSubscriptions."
This reverts commit 9569bc70f923127e7884bd7abfe051e0ccd0216a.
Reason for revert: The cl is breaking git_master.
https://android-build.googleplex.com/builds/submitted/5095196/errorprone/latest/view/logs/build_error.log
Change-Id: I534af936b718b2f132473b5b42ea2faabc9382cd
diff --git a/api/current.txt b/api/current.txt
index 06a51c7..21bab7c 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -43124,7 +43124,7 @@
method public static int getDefaultSmsSubscriptionId();
method public static int getDefaultSubscriptionId();
method public static int getDefaultVoiceSubscriptionId();
- method public java.util.List<android.telephony.SubscriptionInfo> getOpportunisticSubscriptions();
+ method public java.util.List<android.telephony.SubscriptionInfo> getOpportunisticSubscriptions(int);
method public static int getSlotIndex(int);
method public static int[] getSubscriptionIds(int);
method public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int);
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 07d91ef..3b40164 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -2227,27 +2227,22 @@
}
/**
- * Return opportunistic subscriptions that can be visible to the caller.
- * Opportunistic subscriptions are for opportunistic networks, which are cellular
- * networks with limited capabilities and coverage, for example, CBRS.
+ * Get opportunistic data Profiles.
*
- * <p>Requires Permission:
- * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
- * or that the calling app has carrier privileges (see
- * {@link TelephonyManager#hasCarrierPrivileges}).
- *
- * @return the list of opportunistic subscription info. If none exists, an empty list.
+ * Provide all available user downloaded profiles on phone which are used only for
+ * opportunistic data.
+ * @param slotIndex slot on which the profiles are queried from.
+ * @return the list of opportunistic subscription info. If none exists, an empty list.
*/
- @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
- public @NonNull List<SubscriptionInfo> getOpportunisticSubscriptions() {
+ public @NonNull List<SubscriptionInfo> getOpportunisticSubscriptions(int slotIndex) {
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
List<SubscriptionInfo> subInfoList = null;
try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
if (iSub != null) {
- subInfoList = iSub.getOpportunisticSubscriptions(pkgForDebug);
+ subInfoList = iSub.getOpportunisticSubscriptions(slotIndex, pkgForDebug);
}
} catch (RemoteException ex) {
// ignore it
diff --git a/telephony/java/com/android/internal/telephony/ISub.aidl b/telephony/java/com/android/internal/telephony/ISub.aidl
index c80c72e..0ccd748 100755
--- a/telephony/java/com/android/internal/telephony/ISub.aidl
+++ b/telephony/java/com/android/internal/telephony/ISub.aidl
@@ -187,10 +187,10 @@
/**
* Get User downloaded Profiles.
*
- * Return opportunistic subscriptions that can be visible to the caller.
- * @return the list of opportunistic subscription info. If none exists, an empty list.
+ * Provide all available user downloaded profile on the phone.
+ * @param slotId on which phone the switch will operate on
*/
- List<SubscriptionInfo> getOpportunisticSubscriptions(String callingPackage);
+ List<SubscriptionInfo> getOpportunisticSubscriptions(int slotId, String callingPackage);
int getSlotIndex(int subId);