Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" into pi-dev

am: ade0186795

Change-Id: I94821c8390473ea96c2c8f9a674e736587807477
This commit is contained in:
Nathan Harold
2018-04-12 16:36:10 -07:00
committed by android-build-merger

View File

@@ -1013,11 +1013,13 @@ public class CarrierConfigManager {
/**
* Unconditionally override the carrier name string using #KEY_CARRIER_NAME_STRING.
*
* If true, then the carrier display name will be #KEY_CARRIER_NAME_STRING, unconditionally.
* If true, then the carrier name string will be #KEY_CARRIER_NAME_STRING, unconditionally.
*
* <p>If false, then the override will be performed conditionally and the
* #KEY_CARRIER_NAME_STRING will have the lowest-precedence; it will only be used in the event
* that the name string would otherwise be empty, allowing it to serve as a last-resort.
* that the name string would otherwise be empty, allowing it to serve as a last-resort. If
* used, this value functions in place of the SPN on any/all ICC records for the corresponding
* subscription.
*/
public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool";