Merge "Added network service interface" (71793be6) · Commits · e / os / android_frameworks_base

Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -473,6 +473,8 @@ java_library {
		"telephony/java/android/telephony/mbms/IStreamingServiceCallback.aidl",
		"telephony/java/android/telephony/mbms/vendor/IMbmsDownloadService.aidl",
		"telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl",
		"telephony/java/android/telephony/INetworkService.aidl",
		"telephony/java/android/telephony/INetworkServiceCallback.aidl",
		"telephony/java/com/android/ims/internal/IImsCallSession.aidl",
		"telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl",
		"telephony/java/com/android/ims/internal/IImsConfig.aidl",

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -39890,6 +39890,7 @@ package android.telephony {
		field public static final int EUTRAN = 3; // 0x3
		field public static final int GERAN = 1; // 0x1
		field public static final int IWLAN = 5; // 0x5
		field public static final int UNKNOWN = 0; // 0x0
		field public static final int UTRAN = 2; // 0x2
		}

api/system-current.txt

+57 −0

Original line number	Diff line number	Diff line
		@@ -3967,6 +3967,63 @@ package android.telephony {
		field public static final java.lang.String MBMS_STREAMING_SERVICE_ACTION = "android.telephony.action.EmbmsStreaming";
		}

		public class NetworkRegistrationState implements android.os.Parcelable {
		ctor public NetworkRegistrationState(int, int, int, int, int, boolean, int[], android.telephony.CellIdentity);
		ctor protected NetworkRegistrationState(android.os.Parcel);
		method public int describeContents();
		method public int getAccessNetworkTechnology();
		method public int[] getAvailableServices();
		method public int getDomain();
		method public int getRegState();
		method public int getTransportType();
		method public boolean isEmergencyEnabled();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telephony.NetworkRegistrationState> CREATOR;
		field public static final int DOMAIN_CS = 1; // 0x1
		field public static final int DOMAIN_PS = 2; // 0x2
		field public static final int REG_STATE_DENIED = 3; // 0x3
		field public static final int REG_STATE_HOME = 1; // 0x1
		field public static final int REG_STATE_NOT_REG_NOT_SEARCHING = 0; // 0x0
		field public static final int REG_STATE_NOT_REG_SEARCHING = 2; // 0x2
		field public static final int REG_STATE_ROAMING = 5; // 0x5
		field public static final int REG_STATE_UNKNOWN = 4; // 0x4
		field public static final int SERVICE_TYPE_DATA = 2; // 0x2
		field public static final int SERVICE_TYPE_EMERGENCY = 5; // 0x5
		field public static final int SERVICE_TYPE_SMS = 3; // 0x3
		field public static final int SERVICE_TYPE_VIDEO = 4; // 0x4
		field public static final int SERVICE_TYPE_VOICE = 1; // 0x1
		}

		public abstract class NetworkService extends android.app.Service {
		method protected abstract android.telephony.NetworkService.NetworkServiceProvider createNetworkServiceProvider(int);
		field public static final java.lang.String NETWORK_SERVICE_EXTRA_SLOT_ID = "android.telephony.extra.SLOT_ID";
		field public static final java.lang.String NETWORK_SERVICE_INTERFACE = "android.telephony.NetworkService";
		}

		public class NetworkService.NetworkServiceProvider {
		ctor public NetworkService.NetworkServiceProvider(int);
		method public void getNetworkRegistrationState(int, android.telephony.NetworkServiceCallback);
		method public final int getSlotId();
		method public final void notifyNetworkRegistrationStateChanged();
		method protected void onDestroy();
		}

		public class NetworkServiceCallback {
		method public void onGetNetworkRegistrationStateComplete(int, android.telephony.NetworkRegistrationState);
		field public static final int RESULT_ERROR_BUSY = 3; // 0x3
		field public static final int RESULT_ERROR_FAILED = 5; // 0x5
		field public static final int RESULT_ERROR_ILLEGAL_STATE = 4; // 0x4
		field public static final int RESULT_ERROR_INVALID_ARG = 2; // 0x2
		field public static final int RESULT_ERROR_UNSUPPORTED = 1; // 0x1
		field public static final int RESULT_SUCCESS = 0; // 0x0
		}

		public class ServiceState implements android.os.Parcelable {
		method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates();
		method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates(int);
		method public android.telephony.NetworkRegistrationState getNetworkRegistrationStates(int, int);
		}

		public final class SmsManager {
		method public void sendMultipartTextMessageWithoutPersisting(java.lang.String, java.lang.String, java.util.List<java.lang.String>, java.util.List<android.app.PendingIntent>, java.util.List<android.app.PendingIntent>);
		method public void sendTextMessageWithoutPersisting(java.lang.String, java.lang.String, java.lang.String, android.app.PendingIntent, android.app.PendingIntent);

telephony/java/android/telephony/AccessNetworkConstants.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.annotation.SystemApi;
		public final class AccessNetworkConstants {

		public static final class AccessNetworkType {
		public static final int UNKNOWN = 0;
		public static final int GERAN = 1;
		public static final int UTRAN = 2;
		public static final int EUTRAN = 3;

telephony/java/android/telephony/INetworkService.aidl

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017 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.telephony;

		import android.telephony.INetworkServiceCallback;

		/**
		* {@hide}
		*/
		oneway interface INetworkService
		{
		void getNetworkRegistrationState(int domain, INetworkServiceCallback callback);
		void registerForNetworkRegistrationStateChanged(INetworkServiceCallback callback);
		void unregisterForNetworkRegistrationStateChanged(INetworkServiceCallback callback);
		}