diff options
| -rw-r--r-- | Android.bp | 90 | ||||
| -rw-r--r-- | StubLibraries.bp | 4 | ||||
| -rw-r--r-- | core/java/android/telephony/PhoneStateListener.java | 4 | ||||
| -rw-r--r-- | core/java/android/telephony/TelephonyRegistryManager.java | 2 | ||||
| -rw-r--r-- | telephony/common/com/android/internal/telephony/TelephonyPermissions.java | 2 | ||||
| -rw-r--r-- | telephony/framework-telephony-jarjar-rules.txt | 4 | ||||
| -rw-r--r-- | wifi/Android.bp | 1 |
7 files changed, 101 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp index 4c983be1d5de..b3faef1050f6 100644 --- a/Android.bp +++ b/Android.bp @@ -221,7 +221,6 @@ filegroup { ":framework-sax-sources", ":framework-telecomm-sources", ":framework-telephony-common-sources", - ":framework-telephony-sources", ":framework-wifi-annotations", ":framework-wifi-non-updatable-sources", ":PacProcessor-aidl-sources", @@ -256,6 +255,9 @@ filegroup { // etc. ":framework-javastream-protos", ":framework-statslog-gen", + + // telephony annotations + ":framework-telephony-annotations", ], } @@ -270,6 +272,7 @@ filegroup { ":framework-mediaprovider-sources", ":framework-permission-sources", ":framework-wifi-updatable-sources", + ":framework-telephony-sources", ":ike-srcs", ] } @@ -303,7 +306,6 @@ java_defaults { "rs/java", "sax/java", "telecomm/java", - "telephony/java", "wifi/java", ], }, @@ -383,6 +385,7 @@ java_defaults { "updatable_media_stubs", "framework_mediaprovider_stubs", "framework-tethering", + "framework-telephony-stubs", ], jarjar_rules: ":framework-jarjar-rules", @@ -469,6 +472,7 @@ java_library { "//frameworks/base/apex/jobscheduler/framework", "//frameworks/base/apex/permission/framework", "//frameworks/base/apex/statsd/service", + "//frameworks/base/telephony", "//frameworks/base/wifi", "//frameworks/opt/net/wifi/service", ], @@ -501,6 +505,9 @@ java_library { "ike-stubs", // TODO(b/147200698): should be the stub of framework-tethering "framework-tethering", + // TODO (b/147688669) should be framework-telephony-stubs + "framework-telephony", + // TODO(jiyong): add stubs for APEXes here ], sdk_version: "core_platform", apex_available: ["//apex_available:platform"], @@ -1226,3 +1233,82 @@ build = [ "StubLibraries.bp", "ApiDocs.bp", ] + +// TODO(b/147699819): move to frameworks/base/telephony/ folder +droidstubs { + name: "framework-telephony-stubs-srcs", + srcs: [ + ":framework-telephony-sources", + ":framework_native_aidl", + ":framework-javastream-protos", + ], + aidl: { + local_include_dirs: [ + "core/java", + "telecomm/java" + ], + }, + libs: [ + "framework-annotations-lib", + "android.hardware.radio-V1.5-java", + ], + defaults: ["framework-module-stubs-defaults-systemapi"], + filter_packages: ["android.telephony"], + sdk_version: "system_current", +} + +java_library { + name: "framework-telephony-stubs", + srcs: [":framework-telephony-stubs-srcs"], + // TODO(b/147699819): move public aidls to a separate folder and potentially remove + // below aidl exports. + aidl: { + export_include_dirs: ["telephony/java"], + }, + sdk_version: "system_current", +} + +java_library { + name: "framework-telephony", + srcs: [ + ":framework-telephony-sources", + ], + // TODO: change to framework-system-stub to build against system APIs. + libs: [ + "framework-minus-apex", + "unsupportedappusage", + ], + static_libs: [ + "libphonenumber-platform", + "app-compat-annotations", + ], + sdk_version: "core_platform", + aidl: { + export_include_dirs: ["telephony/java"], + include_dirs: [ + "frameworks/native/aidl/binder", + "frameworks/native/aidl/gui", + ] + }, + jarjar_rules: ":telephony-framework-jarjar-rules", + dxflags: [ + "--core-library", + "--multi-dex", + ], + // This is to break the dependency from boot jars. + dex_preopt: { + enabled: false, + }, + installable: true, +} + +filegroup { + // TODO (b/147690217): move to frameworks/base/telephony/common. + name: "framework-telephony-annotations", + srcs: ["telephony/java/android/telephony/Annotation.java"], +} + +filegroup { + name: "telephony-framework-jarjar-rules", + srcs: ["telephony/framework-telephony-jarjar-rules.txt"], +} diff --git a/StubLibraries.bp b/StubLibraries.bp index baa3c615039d..cdc0d322eedb 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -51,6 +51,10 @@ stubs_defaults { ":core_public_api_files", ":ike-api-srcs", ], + // TODO(b/147699819): remove below aidl includes. + aidl: { + local_include_dirs: ["telephony/java"], + }, libs: ["framework-internal-utils"], installable: false, annotations_enabled: true, diff --git a/core/java/android/telephony/PhoneStateListener.java b/core/java/android/telephony/PhoneStateListener.java index c9d3b92b27ff..a4fe6aa0c875 100644 --- a/core/java/android/telephony/PhoneStateListener.java +++ b/core/java/android/telephony/PhoneStateListener.java @@ -985,7 +985,7 @@ public class PhoneStateListener { * TS 24.301 9.9.4.4. Integer.MAX_VALUE if this value is unused. */ public void onRegistrationFailed(@NonNull CellIdentity cellIdentity, @NonNull String chosenPlmn, - @NetworkRegistrationInfo.Domain int domain, int causeCode, int additionalCauseCode) { + int domain, int causeCode, int additionalCauseCode) { // default implementation empty } @@ -1277,7 +1277,7 @@ public class PhoneStateListener { } public void onRegistrationFailed(@NonNull CellIdentity cellIdentity, - @NonNull String chosenPlmn, @NetworkRegistrationInfo.Domain int domain, + @NonNull String chosenPlmn, int domain, int causeCode, int additionalCauseCode) { PhoneStateListener psl = mPhoneStateListenerWeakRef.get(); if (psl == null) return; diff --git a/core/java/android/telephony/TelephonyRegistryManager.java b/core/java/android/telephony/TelephonyRegistryManager.java index 4dffa62e6a7d..e25826c25e35 100644 --- a/core/java/android/telephony/TelephonyRegistryManager.java +++ b/core/java/android/telephony/TelephonyRegistryManager.java @@ -701,7 +701,7 @@ public class TelephonyRegistryManager { */ public void notifyRegistrationFailed(int slotIndex, int subId, @NonNull CellIdentity cellIdentity, @NonNull String chosenPlmn, - @NetworkRegistrationInfo.Domain int domain, int causeCode, int additionalCauseCode) { + int domain, int causeCode, int additionalCauseCode) { try { sRegistry.notifyRegistrationFailed(slotIndex, subId, cellIdentity, chosenPlmn, domain, causeCode, additionalCauseCode); diff --git a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java index f6ce0dc827d8..b8b203def6b8 100644 --- a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java +++ b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java @@ -592,7 +592,7 @@ public final class TelephonyPermissions { private static boolean checkCarrierPrivilegeForAnySubId(Context context, int uid) { SubscriptionManager sm = (SubscriptionManager) context.getSystemService( Context.TELEPHONY_SUBSCRIPTION_SERVICE); - int[] activeSubIds = sm.getActiveSubscriptionIdList(/* visibleOnly */ false); + int[] activeSubIds = sm.getActiveAndHiddenSubscriptionIdList(); for (int activeSubId : activeSubIds) { if (getCarrierPrivilegeStatus(context, activeSubId, uid) == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) { diff --git a/telephony/framework-telephony-jarjar-rules.txt b/telephony/framework-telephony-jarjar-rules.txt new file mode 100644 index 000000000000..7cab806298a4 --- /dev/null +++ b/telephony/framework-telephony-jarjar-rules.txt @@ -0,0 +1,4 @@ +rule android.telephony.Annotation* android.telephony.framework.Annotation@1 +rule com.android.i18n.phonenumbers.** com.android.telephony.framework.phonenumbers.@1 +#TODO: add jarjar rules for statically linked util classes + diff --git a/wifi/Android.bp b/wifi/Android.bp index 70c9befce66a..4c9ee854536e 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -70,6 +70,7 @@ java_library { "framework-annotations-lib", "unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage "unsupportedappusage-annotation", // for dalvik.annotation.compat.UnsupportedAppUsage + "framework-telephony-stubs", ], srcs: [ ":framework-wifi-updatable-sources", |