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

Merge changes from topic "cpcpcp"

Browse Source 
* changes:
  move encodeException to non-updatable framework/base/telephony/common
  move IApnSourceService.aidl to android.service.carrier
  use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs
  apply correct @SystemAPI for PackageManager
This commit is contained in:
Chen Xu
2019-12-14 04:16:54 +00:00
committed by Gerrit Code Review
parent fd5241f120 4c0941420e
commit b25174e9d0
5 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/carrier/ApnService.java
View File

@@ -26,7 +26,7 @@ import android.content.Intent;
import android.os.IBinder; import android.os.IBinder;
import android.util.Log; import android.util.Log;
import com.android.internal.telephony.IApnSourceService; import android.service.carrier.IApnSourceService;
import java.util.List; import java.util.List;

3
telephony/java/com/android/internal/telephony/IApnSourceService.aidl → core/java/android/service/carrier/IApnSourceService.aidl
View File

@@ -14,10 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.internal.telephony; package android.service.carrier;
import android.content.ContentValues; import android.content.ContentValues;
/** @hide */
interface IApnSourceService { interface IApnSourceService {
/** Retreive APNs. */ /** Retreive APNs. */
ContentValues[] getApns(int subId); ContentValues[] getApns(int subId);

0
telephony/java/com/android/internal/telephony/EncodeException.java → telephony/common/com/android/internal/telephony/EncodeException.java
View File

2
telephony/common/com/android/internal/telephony/SmsApplication.java
View File

@@ -305,7 +305,7 @@ public final class SmsApplication {
Uri.fromParts(SCHEME_SMSTO, "", null)); Uri.fromParts(SCHEME_SMSTO, "", null));
List<ResolveInfo> respondServices = packageManager.queryIntentServicesAsUser(intent, List<ResolveInfo> respondServices = packageManager.queryIntentServicesAsUser(intent,
PackageManager.MATCH_DIRECT_BOOT_AWARE | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, PackageManager.MATCH_DIRECT_BOOT_AWARE | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
UserHandle.getUserHandleForUid(userId)); UserHandle.of(userId));
for (ResolveInfo resolveInfo : respondServices) { for (ResolveInfo resolveInfo : respondServices) {
final ServiceInfo serviceInfo = resolveInfo.serviceInfo; final ServiceInfo serviceInfo = resolveInfo.serviceInfo;
if (serviceInfo == null) { if (serviceInfo == null) {

5
telephony/java/android/telephony/SmsManager.java
View File

@@ -79,11 +79,6 @@ public final class SmsManager {
SubscriptionManager.DEFAULT_SUBSCRIPTION_ID); SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
private static final Object sLockObject = new Object(); 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 /** SMS record length from TS 51.011 10.5.3
* @hide * @hide
*/ */