diff options
| -rw-r--r-- | flags/Android.bp | 1 | ||||
| -rw-r--r-- | flags/data.aconfig | 1 | ||||
| -rw-r--r-- | flags/domainselection.aconfig | 1 | ||||
| -rw-r--r-- | flags/ims.aconfig | 1 | ||||
| -rw-r--r-- | flags/iwlan.aconfig | 1 | ||||
| -rw-r--r-- | flags/messaging.aconfig | 3 | ||||
| -rw-r--r-- | flags/misc.aconfig | 3 | ||||
| -rw-r--r-- | flags/network.aconfig | 1 | ||||
| -rw-r--r-- | flags/satellite.aconfig | 3 | ||||
| -rw-r--r-- | flags/subscription.aconfig | 3 | ||||
| -rw-r--r-- | flags/telephony.aconfig | 1 | ||||
| -rw-r--r-- | flags/uicc.aconfig | 3 | ||||
| -rw-r--r-- | src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java | 2 |
13 files changed, 18 insertions, 6 deletions
diff --git a/flags/Android.bp b/flags/Android.bp index 3c0deeef67..dd230c65bb 100644 --- a/flags/Android.bp +++ b/flags/Android.bp @@ -21,6 +21,7 @@ package { aconfig_declarations { name: "telephony_flags", package: "com.android.internal.telephony.flags", + container: "system", srcs: [ "data.aconfig", "domainselection.aconfig", diff --git a/flags/data.aconfig b/flags/data.aconfig index 267048e219..10affc4ac0 100644 --- a/flags/data.aconfig +++ b/flags/data.aconfig @@ -1,4 +1,5 @@ package: "com.android.internal.telephony.flags" +container: "system" flag { name: "auto_switch_allow_roaming" diff --git a/flags/domainselection.aconfig b/flags/domainselection.aconfig index 2e1dfc834d..8ca6bd3b58 100644 --- a/flags/domainselection.aconfig +++ b/flags/domainselection.aconfig @@ -1,4 +1,5 @@ package: "com.android.internal.telephony.flags" +container: "system" flag { name: "ap_domain_selection_enabled" diff --git a/flags/ims.aconfig b/flags/ims.aconfig index 4638194f81..173f4ee44b 100644 --- a/flags/ims.aconfig +++ b/flags/ims.aconfig @@ -1,4 +1,5 @@ package: "com.android.internal.telephony.flags" +container: "system" flag { name: "conference_hold_unhold_changed_to_send_message" diff --git a/flags/iwlan.aconfig b/flags/iwlan.aconfig index 0dc9f8db40..472baba89e 100644 --- a/flags/iwlan.aconfig +++ b/flags/iwlan.aconfig @@ -1,4 +1,5 @@ package: "com.android.internal.telephony.flags" +container: "system" flag { name: "enable_aead_algorithms" diff --git a/flags/messaging.aconfig b/flags/messaging.aconfig index 1ba89baa47..52c62135cf 100644 --- a/flags/messaging.aconfig +++ b/flags/messaging.aconfig @@ -1,4 +1,5 @@ package: "com.android.internal.telephony.flags" +container: "system" flag { name: "reject_bad_sub_id_interaction" @@ -19,4 +20,4 @@ flag { namespace: "telephony" description: "This flag controls the support of the new MMS error code MMS_ERROR_MMS_DISABLED." bug: "305062594" -}
\ No newline at end of file +} diff --git a/flags/misc.aconfig b/flags/misc.aconfig index de5adea060..793169d596 100644 --- a/flags/misc.aconfig +++ b/flags/misc.aconfig @@ -1,4 +1,5 @@ package: "com.android.internal.telephony.flags" +container: "system" flag { name: "do_not_override_precise_label" @@ -79,4 +80,4 @@ flag { metadata { purpose: PURPOSE_BUGFIX } -}
\ No newline at end of file +} diff --git a/flags/network.aconfig b/flags/network.aconfig index 27489f40f5..a2fae76c2a 100644 --- a/flags/network.aconfig +++ b/flags/network.aconfig @@ -1,4 +1,5 @@ package: "com.android.internal.telephony.flags" +container: "system" flag { name: "enable_carrier_config_n1_control" diff --git a/flags/satellite.aconfig b/flags/satellite.aconfig index e640e6ea2e..4a028545e9 100644 --- a/flags/satellite.aconfig +++ b/flags/satellite.aconfig @@ -1,4 +1,5 @@ package: "com.android.internal.telephony.flags" +container: "system" flag { name: "oem_enabled_satellite_flag" @@ -12,4 +13,4 @@ flag { namespace: "telephony" description: "This flag controls satellite communication supported by carriers." bug:"296437388" -}
\ No newline at end of file +} diff --git a/flags/subscription.aconfig b/flags/subscription.aconfig index 0521cb998b..a28521fa08 100644 --- a/flags/subscription.aconfig +++ b/flags/subscription.aconfig @@ -1,8 +1,9 @@ package: "com.android.internal.telephony.flags" +container: "system" flag { name: "work_profile_api_split" namespace: "telephony" description: "To support separation between personal and work from TelephonyManager and SubscriptionManager API perspective." bug: "296076674" -}
\ No newline at end of file +} diff --git a/flags/telephony.aconfig b/flags/telephony.aconfig index b849d53e64..ef6ba517ec 100644 --- a/flags/telephony.aconfig +++ b/flags/telephony.aconfig @@ -1,4 +1,5 @@ package: "com.android.internal.telephony.flags" +container: "system" flag { name: "enforce_telephony_feature_mapping" diff --git a/flags/uicc.aconfig b/flags/uicc.aconfig index b2024b006e..a1768bb048 100644 --- a/flags/uicc.aconfig +++ b/flags/uicc.aconfig @@ -1,4 +1,5 @@ package: "com.android.internal.telephony.flags" +container: "system" flag { name: "esim_bootstrap_provisioning_flag" @@ -17,4 +18,4 @@ flag { namespace: "telephony" description: "This flag control the visibility of the getCarrierRestrictionStatus in carrierRestrictionRules class." bug:"313553044" -}
\ No newline at end of file +} diff --git a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java index a8d05a334b..93eeb3f53e 100644 --- a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java +++ b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java @@ -2379,7 +2379,7 @@ public class SubscriptionManagerService extends ISub.Stub { }) public int setOpportunistic(boolean opportunistic, int subId, @NonNull String callingPackage) { TelephonyPermissions.enforceAnyPermissionGrantedOrCarrierPrivileges( - mContext, Binder.getCallingUid(), subId, true, "setOpportunistic", + mContext, subId, Binder.getCallingUid(), true, "setOpportunistic", Manifest.permission.MODIFY_PHONE_STATE); long token = Binder.clearCallingIdentity(); |