Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b25174e9 authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge changes from topic "cpcpcp" 

* 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
parents fd5241f1 4c094142

core/java/android/service/carrier/ApnService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -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);

telephony/common/com/android/internal/telephony/SmsApplication.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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) {

telephony/java/android/telephony/SmsManager.java

+0 −5
Original line number Original line Diff line number Diff line
@@ -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

     */

     */