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

Merge changes from topics "subscriptionInfo_builder", "subscription_manager_service"

Browse Source 
* changes:
  Added builder for SubscriptionInfo
  Added empty subscription manager service
This commit is contained in:
Jack Yu
2023-02-27 19:46:34 +00:00
committed by Gerrit Code Review
parent 9ca50dba46 6a0a3326fa
commit 20f007c38c
3 changed files with 957 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/config_telephony.xml
View File

@@ -113,4 +113,8 @@
new network. --> new network. -->
<bool name="config_enhanced_iwlan_handover_check">true</bool> <bool name="config_enhanced_iwlan_handover_check">true</bool>
<java-symbol type="bool" name="config_enhanced_iwlan_handover_check" /> <java-symbol type="bool" name="config_enhanced_iwlan_handover_check" />
<!-- Whether using the new SubscriptionManagerService or the old SubscriptionController -->
<bool name="config_using_subscription_manager_service">false</bool>
<java-symbol type="bool" name="config_using_subscription_manager_service" />
</resources> </resources>

1265
telephony/java/android/telephony/SubscriptionInfo.java
View File

File diff suppressed because it is too large Load Diff

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

@@ -3079,7 +3079,7 @@ public class SubscriptionManager {
@SystemApi @SystemApi
public boolean canManageSubscription(@NonNull SubscriptionInfo info, public boolean canManageSubscription(@NonNull SubscriptionInfo info,
@NonNull String packageName) { @NonNull String packageName) {
if (info == null || info.getAllAccessRules() == null || packageName == null) { if (info == null || info.getAccessRules() == null || packageName == null) {
return false; return false;
} }
PackageManager packageManager = mContext.getPackageManager(); PackageManager packageManager = mContext.getPackageManager();
@@ -3091,7 +3091,7 @@ public class SubscriptionManager {
logd("Unknown package: " + packageName); logd("Unknown package: " + packageName);
return false; return false;
} }
for (UiccAccessRule rule : info.getAllAccessRules()) { for (UiccAccessRule rule : info.getAccessRules()) {
if (rule.getCarrierPrivilegeStatus(packageInfo) if (rule.getCarrierPrivilegeStatus(packageInfo)
== TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) { == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
return true; return true;