summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author arunvoddu <arunvoddu@google.com> 2024-05-23 17:25:19 +0000
committer Steve Statia <stevestatia@google.com> 2024-05-30 22:11:54 +0000
commit4e8e2394904cebbfeccb54ef5f6aa7e8ab7b71c6 (patch)
treebb3d4e9e761b5bc8217732a36ff356a27496bb3a
parent6203f2d08f493557cce99ae4a47e068d8f101f36 (diff)
Change the visibility of setCarrierRestrictionStatus API in carrierRestrictionRules
The change is to facilitate the OobConfig application to pass the lock information to the modem. Bug: 342411308 Test: Built successfully Change-Id: I14a7a19286a7b2a9d073bcbaac7b35d6310d67f6
-rw-r--r--core/api/system-current.txt1
-rw-r--r--telephony/java/android/telephony/CarrierRestrictionRules.java5
2 files changed, 4 insertions, 2 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 96315ebccc49..50d97cf0626f 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -14435,6 +14435,7 @@ package android.telephony {
method @NonNull public android.telephony.CarrierRestrictionRules build();
method @NonNull public android.telephony.CarrierRestrictionRules.Builder setAllCarriersAllowed();
method @NonNull public android.telephony.CarrierRestrictionRules.Builder setAllowedCarriers(@NonNull java.util.List<android.service.carrier.CarrierIdentifier>);
+ method @FlaggedApi("com.android.internal.telephony.flags.set_carrier_restriction_status") @NonNull public android.telephony.CarrierRestrictionRules.Builder setCarrierRestrictionStatus(int);
method @NonNull public android.telephony.CarrierRestrictionRules.Builder setDefaultCarrierRestriction(int);
method @NonNull public android.telephony.CarrierRestrictionRules.Builder setExcludedCarriers(@NonNull java.util.List<android.service.carrier.CarrierIdentifier>);
method @NonNull public android.telephony.CarrierRestrictionRules.Builder setMultiSimPolicy(int);
diff --git a/telephony/java/android/telephony/CarrierRestrictionRules.java b/telephony/java/android/telephony/CarrierRestrictionRules.java
index d5db61233230..65e8e13036a6 100644
--- a/telephony/java/android/telephony/CarrierRestrictionRules.java
+++ b/telephony/java/android/telephony/CarrierRestrictionRules.java
@@ -555,10 +555,11 @@ public final class CarrierRestrictionRules implements Parcelable {
* Set the device's carrier restriction status
*
* @param carrierRestrictionStatus device restriction status
- * @hide
*/
public @NonNull
- Builder setCarrierRestrictionStatus(int carrierRestrictionStatus) {
+ @FlaggedApi(Flags.FLAG_SET_CARRIER_RESTRICTION_STATUS)
+ Builder setCarrierRestrictionStatus(
+ @CarrierRestrictionStatus int carrierRestrictionStatus) {
mRules.mCarrierRestrictionStatus = carrierRestrictionStatus;
return this;
}