From 34cb2ad45e523fa7e7af93d4de2ff056cad3587a Mon Sep 17 00:00:00 2001 From: Chen Xu Date: Mon, 5 Aug 2019 11:20:58 -0700 Subject: [PATCH 1/4] apply correct @SystemAPI for PackageManager Bug: 138772432 Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testSuspendPackage Change-Id: I93441ed2dba933946aeaeabcfdb65e41bfccc447 (cherry picked from commit 6dcc20e79ae4d880e71fa166aed57222df519ef9) Merged-in: I93441ed2dba933946aeaeabcfdb65e41bfccc447 --- .../common/com/android/internal/telephony/SmsApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telephony/common/com/android/internal/telephony/SmsApplication.java b/telephony/common/com/android/internal/telephony/SmsApplication.java index 7cf4eebabec9e..df668ea2313d4 100644 --- a/telephony/common/com/android/internal/telephony/SmsApplication.java +++ b/telephony/common/com/android/internal/telephony/SmsApplication.java @@ -305,7 +305,7 @@ public final class SmsApplication { Uri.fromParts(SCHEME_SMSTO, "", null)); List respondServices = packageManager.queryIntentServicesAsUser(intent, PackageManager.MATCH_DIRECT_BOOT_AWARE | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, - UserHandle.getUserHandleForUid(userId)); + UserHandle.of(userId)); for (ResolveInfo resolveInfo : respondServices) { final ServiceInfo serviceInfo = resolveInfo.serviceInfo; if (serviceInfo == null) { From 125e446c18e811f6cdc39a5837ab9f3950b1f440 Mon Sep 17 00:00:00 2001 From: Chen Xu Date: Tue, 5 Nov 2019 16:51:05 -0800 Subject: [PATCH 2/4] use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs Bug: 135956699 Test: unit test Change-Id: Id631875ba6639ebf4fa569696a982c49d9c93e8f (cherry picked from commit dd79281f9708ce6b0e96590da8db89d229af4f9b) Merged-in: Id631875ba6639ebf4fa569696a982c49d9c93e8f --- telephony/java/android/telephony/SmsManager.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index daeacf8206b4f..4859ece91d1b6 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -79,11 +79,6 @@ public final class SmsManager { SubscriptionManager.DEFAULT_SUBSCRIPTION_ID); private static final Object sLockObject = new Object(); - /** @hide */ - public static final int CELL_BROADCAST_RAN_TYPE_GSM = 0; - /** @hide */ - public static final int CELL_BROADCAST_RAN_TYPE_CDMA = 1; - /** SMS record length from TS 51.011 10.5.3 * @hide */ From 2a03dd50ce5ea8e262451952ae8a80d0514f1092 Mon Sep 17 00:00:00 2001 From: Chen Xu Date: Mon, 16 Sep 2019 18:16:46 -0700 Subject: [PATCH 3/4] move IApnSourceService.aidl to android.service.carrier Bug: 140908357 Test: Build & Manual Change-Id: I21b83798f5ecd819627a7168c167cf3cfe99dd68 (cherry picked from commit 478ba408d3850944b44171cc2ef619719951f30f) Merged-in: I21b83798f5ecd819627a7168c167cf3cfe99dd68 --- core/java/android/service/carrier/ApnService.java | 2 +- .../java/android/service/carrier}/IApnSourceService.aidl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) rename {telephony/java/com/android/internal/telephony => core/java/android/service/carrier}/IApnSourceService.aidl (94%) diff --git a/core/java/android/service/carrier/ApnService.java b/core/java/android/service/carrier/ApnService.java index 57e4b1b407488..0c12fd409078b 100644 --- a/core/java/android/service/carrier/ApnService.java +++ b/core/java/android/service/carrier/ApnService.java @@ -26,7 +26,7 @@ import android.content.Intent; import android.os.IBinder; import android.util.Log; -import com.android.internal.telephony.IApnSourceService; +import android.service.carrier.IApnSourceService; import java.util.List; diff --git a/telephony/java/com/android/internal/telephony/IApnSourceService.aidl b/core/java/android/service/carrier/IApnSourceService.aidl similarity index 94% rename from telephony/java/com/android/internal/telephony/IApnSourceService.aidl rename to core/java/android/service/carrier/IApnSourceService.aidl index 34c9067c3f2f7..fadd2ff1a772b 100644 --- a/telephony/java/com/android/internal/telephony/IApnSourceService.aidl +++ b/core/java/android/service/carrier/IApnSourceService.aidl @@ -14,10 +14,11 @@ * limitations under the License. */ -package com.android.internal.telephony; +package android.service.carrier; import android.content.ContentValues; +/** @hide */ interface IApnSourceService { /** Retreive APNs. */ ContentValues[] getApns(int subId); From 4c0941420e798b7916799cc381191e173564ed05 Mon Sep 17 00:00:00 2001 From: Chen Xu Date: Tue, 26 Nov 2019 13:46:41 -0800 Subject: [PATCH 4/4] move encodeException to non-updatable framework/base/telephony/common Bug: 140908357 Test: Build Change-Id: I9be6b41fe4af0eb4eb56debffc020735509dc407 (cherry picked from commit 3a7dfca8db0185ce0683e22c11b7906215a96a51) Merged-in: I9be6b41fe4af0eb4eb56debffc020735509dc407 --- .../com/android/internal/telephony/EncodeException.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename telephony/{java => common}/com/android/internal/telephony/EncodeException.java (100%) diff --git a/telephony/java/com/android/internal/telephony/EncodeException.java b/telephony/common/com/android/internal/telephony/EncodeException.java similarity index 100% rename from telephony/java/com/android/internal/telephony/EncodeException.java rename to telephony/common/com/android/internal/telephony/EncodeException.java