Merge "Add NAME_SOURCE_CARRIER for subscription display name." into qt-dev

am: ed4fe03371 Change-Id: I4d1b660864e44dd05be2aaa6477a5414c89aca6f
2019-05-14 23:14:57 -07:00
parent b77bf39d68 ed4fe03371
commit 6853ba9296
1 changed files with 6 additions and 0 deletions
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -395,6 +395,12 @@ public class SubscriptionManager {
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
    public static final int NAME_SOURCE_USER_INPUT = 2;

+    /**
+     * The name_source is carrier (carrier app, carrier config, etc.)
+     * @hide
+     */
+    public static final int NAME_SOURCE_CARRIER = 3;
+
    /**
     * TelephonyProvider column name for the color of a SIM.
     * <P>Type: INTEGER (int)</P>