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

Commit 2f2dd0a6 authored by Jordan Liu's avatar Jordan Liu
Browse files

Expose ApnService as a SystemApi and use subId arg 

IApnSourceService#getApns now takes a subId argument, and can be
implemented by extending ApnService.

Bug: 113075153
Test: unit tests and manual
Change-Id: I0202c1f0529ecef558f06a9f8a90a3906912f2f0
Merged-In: I9cfcf977c20f33abd2d773393780f9e54d75fe21
parent 2c250e32

api/system-current.txt

+10 −0
Original line number Diff line number Diff line
@@ -4457,6 +4457,16 @@ package android.service.autofill { 


}



package android.service.carrier {



  public abstract class ApnService extends android.app.Service {

    ctor public ApnService();

    method public abstract java.util.List<android.content.ContentValues> onRestoreApns(int);

    method public android.os.IBinder onBind(android.content.Intent);

  }



}



package android.service.euicc {



  public final class EuiccProfileInfo implements android.os.Parcelable {

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

0 → 100644
+77 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.service.carrier;



import android.annotation.SystemApi;

import android.annotation.WorkerThread;

import android.app.Service;

import android.content.ContentValues;

import android.content.Intent;

import android.os.IBinder;

import android.util.Log;



import com.android.internal.telephony.IApnSourceService;



import java.util.List;



/**

 * A service that the system can call to restore default APNs.

 * <p>

 * To extend this class, specify the full name of your implementation in the resource file

 * {@code packages/providers/TelephonyProvider/res/values/config.xml} as the

 * {@code apn_source_service}.

 * </p>

 *

 * @hide

 */

@SystemApi

public abstract class ApnService extends Service {



    private static final String LOG_TAG = "ApnService";



    private final IApnSourceService.Stub mBinder = new IApnSourceService.Stub() {

        /**

         * Retreive APNs for the default slot index.

         */

        @Override

        public ContentValues[] getApns(int subId) {

            try {

                List<ContentValues> apns = ApnService.this.onRestoreApns(subId);

                return apns.toArray(new ContentValues[apns.size()]);

            } catch (Exception e) {

                Log.e(LOG_TAG, "Error in getApns for subId=" + subId + ": " + e.getMessage(), e);

                return null;

            }

        }

    };



    @Override

    public IBinder onBind(Intent intent) {

        return mBinder;

    }



    /**

     * Override this method to restore default user APNs with a carrier service instead of the

     * built in platform xml APNs list.

     * <p>

     * This method is called by the TelephonyProvider when the user requests restoring the default

     * APNs. It should return a list of ContentValues representing the default APNs for the given

     * subId.

     */

    @WorkerThread

    public abstract List<ContentValues> onRestoreApns(int subId);

}

telephony/java/com/android/internal/telephony/IApnSourceService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@ import android.content.ContentValues; 


interface IApnSourceService {

    /** Retreive APNs. */

    ContentValues[] getApns();

    ContentValues[] getApns(int subId);

}