From 9ecb50e4fda0f0a759f9e20ff3c59c9f97293efe Mon Sep 17 00:00:00 2001
From: Jayachandran C <jayachandranc@google.com>
Date: Fri, 8 Nov 2019 00:47:34 -0800
Subject: [PATCH] Expose SubscriptionManager.getActiveDataSubscriptionId() as
 public API

Bug: 134702460
Bug: 111498835
Test: make
Change-Id: I7875438876af890cdbe8943458a45b816c6f2887
---
 api/current.txt                                       |  1 +
 .../java/android/telephony/SubscriptionManager.java   | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 98674f939d56a..f7f47ecbb0ec2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -44894,6 +44894,7 @@ package android.telephony {
     method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.os.ParcelUuid createSubscriptionGroup(@NonNull java.util.List<java.lang.Integer>);
     method @Deprecated public static android.telephony.SubscriptionManager from(android.content.Context);
     method public java.util.List<android.telephony.SubscriptionInfo> getAccessibleSubscriptionInfoList();
+    method public static int getActiveDataSubscriptionId();
     method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);
     method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getActiveSubscriptionInfoCount();
     method public int getActiveSubscriptionInfoCountMax();
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 3bd6578f337e7..2012409ebc49d 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -3202,13 +3202,14 @@ private int setSubscriptionPropertyHelper(int subId, String methodName,
     }
 
     /**
-     * Get active data subscription id.
-     * See {@link PhoneStateListener#onActiveDataSubscriptionIdChanged(int)} for the details.
+     * Get active data subscription id. Active data subscription refers to the subscription
+     * currently chosen to provide cellular internet connection to the user. This may be
+     * different from getDefaultDataSubscriptionId(). Eg. Opportunistics data
      *
-     * @return Active data subscription id
+     * See {@link PhoneStateListener#onActiveDataSubscriptionIdChanged(int)} for the details.
      *
-     * //TODO: Refactor this API in b/134702460
-     * @hide
+     * @return Active data subscription id if any is chosen, or
+     * SubscriptionManager.INVALID_SUBSCRIPTION_ID if not.
      */
     public static int getActiveDataSubscriptionId() {
         try {