Merge "Cleanup ISub.aidl" into lmp-dev (0065e2e6) · Commits · e / os / android_frameworks_base

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

+14 −28

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011-2014 MediaTek Inc.
		* Copyright (C) 2014 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.
		@@ -22,7 +22,6 @@ import android.telephony.SubInfoRecord;
		interface ISub {
		/**
		* Get the SubInfoRecord according to an index
		* @param context Context provided by caller
		* @param subId The unique SubInfoRecord index in database
		* @return SubInfoRecord, maybe null
		*/
		@@ -30,7 +29,6 @@ interface ISub {

		/**
		* Get the SubInfoRecord according to an IccId
		* @param context Context provided by caller
		* @param iccId the IccId of SIM card
		* @return SubInfoRecord, maybe null
		*/
		@@ -38,7 +36,6 @@ interface ISub {

		/**
		* Get the SubInfoRecord according to slotId
		* @param context Context provided by caller
		* @param slotId the slot which the SIM is inserted
		* @return SubInfoRecord, maybe null
		*/
		@@ -46,35 +43,30 @@ interface ISub {

		/**
		* Get all the SubInfoRecord(s) in subinfo database
		* @param context Context provided by caller
		* @return Array list of all SubInfoRecords in database, include thsoe that were inserted before
		*/
		List<SubInfoRecord> getAllSubInfoList();

		/**
		* Get the SubInfoRecord(s) of the currently inserted SIM(s)
		* @param context Context provided by caller
		* @return Array list of currently inserted SubInfoRecord(s)
		*/
		List<SubInfoRecord> getActiveSubInfoList();

		/**
		* Get the SUB count of all SUB(s) in subinfo database
		* @param context Context provided by caller
		* @return all SIM count in database, include what was inserted before
		*/
		int getAllSubInfoCount();

		/**
		* Get the count of active SUB(s)
		* @param context Context provided by caller
		* @return active SIM count
		*/
		int getActiveSubInfoCount();

		/**
		* Add a new SubInfoRecord to subinfo database if needed
		* @param context Context provided by caller
		* @param iccId the IccId of the SIM card
		* @param slotId the slot which the SIM is inserted
		* @return the URL of the newly created row or the updated row
		@@ -83,7 +75,6 @@ interface ISub {

		/**
		* Set SIM color by simInfo index
		* @param context Context provided by caller
		* @param color the color of the SIM
		* @param subId the unique SubInfoRecord index in database
		* @return the number of records updated
		@@ -92,7 +83,6 @@ interface ISub {

		/**
		* Set display name by simInfo index
		* @param context Context provided by caller
		* @param displayName the display name of SIM card
		* @param subId the unique SubInfoRecord index in database
		* @return the number of records updated
		@@ -101,7 +91,6 @@ interface ISub {

		/**
		* Set display name by simInfo index with name source
		* @param context Context provided by caller
		* @param displayName the display name of SIM card
		* @param subId the unique SubInfoRecord index in database
		* @param nameSource, 0: DEFAULT_SOURCE, 1: SIM_SOURCE, 2: USER_INPUT
		@@ -111,7 +100,6 @@ interface ISub {

		/**
		* Set phone number by subId
		* @param context Context provided by caller
		* @param number the phone number of the SIM
		* @param subId the unique SubInfoRecord index in database
		* @return the number of records updated
		@@ -120,7 +108,6 @@ interface ISub {

		/**
		* Set number display format. 0: none, 1: the first four digits, 2: the last four digits
		* @param context Context provided by caller
		* @param format the display format of phone number
		* @param subId the unique SubInfoRecord index in database
		* @return the number of records updated
		@@ -129,7 +116,6 @@ interface ISub {

		/**
		* Set data roaming by simInfo index
		* @param context Context provided by caller
		* @param roaming 0:Don't allow data when roaming, 1:Allow data when roaming
		* @param subId the unique SubInfoRecord index in database
		* @return the number of records updated