Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Telephony Mainline] Add SimInfo.CONTENT_URI instead SubscriptionManager.CONTENT_URI for mainline

Browse Source 
Bug: 144972924
Test: make
Change-Id: I86c39f4a353412a66934b735957d5d06c478fe8e
Merged-In: I86c39f4a353412a66934b735957d5d06c478fe8e
This commit is contained in:
changbetty
2019-12-02 15:04:49 +08:00
parent 04872c7b6b
commit 239b6ce359
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -6628,6 +6628,10 @@ package android.provider {
field public static final String SUB_ID = "sub_id";
}
public static final class Telephony.SimInfo {
field @NonNull public static final android.net.Uri CONTENT_URI;
}
public static final class Telephony.Sms.Intents {
field public static final String ACTION_SMS_EMERGENCY_CB_RECEIVED = "android.provider.action.SMS_EMERGENCY_CB_RECEIVED";
}

19
core/java/android/provider/Telephony.java
View File

@@ -4811,4 +4811,23 @@ public final class Telephony {
public static final Uri CONTENT_URI = Uri.parse("content://carrier_id/all");
}
}
/**
* Contains SIM Information
* @hide
*/
@SystemApi
public static final class SimInfo {
/**
* Not instantiable.
* @hide
*/
private SimInfo() {}
/**
* The {@code content://} style URI for this provider.
*/
@NonNull
public static final Uri CONTENT_URI = Uri.parse("content://telephony/siminfo");
}
}

3
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -55,6 +55,7 @@ import android.os.ParcelUuid;
import android.os.Process;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.provider.Telephony.SimInfo;
import android.telephony.euicc.EuiccManager;
import android.telephony.ims.ImsMmTelManager;
import android.util.DisplayMetrics;
@@ -130,7 +131,7 @@ public class SubscriptionManager {
/** @hide */
@UnsupportedAppUsage
public static final Uri CONTENT_URI = Uri.parse("content://telephony/siminfo");
public static final Uri CONTENT_URI = SimInfo.CONTENT_URI;
/**
* Generates a content {@link Uri} used to receive updates on simInfo change