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

Merge "Hide the IMS call barring constants" into rvc-dev am: bee68ea797 am: 7f8027a23b am: aa0dd21577

Browse Source 
Change-Id: I5b5a6c0d486cd5cacba2551ec75d5d79409398d1
This commit is contained in:
Automerger Merge Worker
2020-03-14 01:41:24 +00:00
parent de06a5a6ff aa0dd21577
commit 31513b4ac6
3 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/system-current.txt
View File

@@ -12976,17 +12976,6 @@ package android.telephony.ims.stub {
method public int updateClir(int);
method public int updateColp(boolean);
method public int updateColr(int);
field public static final int CALL_BARRING_ALL = 7; // 0x7
field public static final int CALL_BARRING_ALL_INCOMING = 1; // 0x1
field public static final int CALL_BARRING_ALL_OUTGOING = 2; // 0x2
field public static final int CALL_BARRING_ANONYMOUS_INCOMING = 6; // 0x6
field public static final int CALL_BARRING_INCOMING_ALL_SERVICES = 9; // 0x9
field public static final int CALL_BARRING_OUTGOING_ALL_SERVICES = 8; // 0x8
field public static final int CALL_BARRING_OUTGOING_INTL = 3; // 0x3
field public static final int CALL_BARRING_OUTGOING_INTL_EXCL_HOME = 4; // 0x4
field public static final int CALL_BARRING_SPECIFIC_INCOMING_CALLS = 10; // 0xa
field public static final int CALL_BLOCKING_INCOMING_WHEN_ROAMING = 5; // 0x5
field public static final int INVALID_RESULT = -1; // 0xffffffff
}
}

11
api/test-current.txt
View File

@@ -4672,17 +4672,6 @@ package android.telephony.ims.stub {
method public int updateClir(int);
method public int updateColp(boolean);
method public int updateColr(int);
field public static final int CALL_BARRING_ALL = 7; // 0x7
field public static final int CALL_BARRING_ALL_INCOMING = 1; // 0x1
field public static final int CALL_BARRING_ALL_OUTGOING = 2; // 0x2
field public static final int CALL_BARRING_ANONYMOUS_INCOMING = 6; // 0x6
field public static final int CALL_BARRING_INCOMING_ALL_SERVICES = 9; // 0x9
field public static final int CALL_BARRING_OUTGOING_ALL_SERVICES = 8; // 0x8
field public static final int CALL_BARRING_OUTGOING_INTL = 3; // 0x3
field public static final int CALL_BARRING_OUTGOING_INTL_EXCL_HOME = 4; // 0x4
field public static final int CALL_BARRING_SPECIFIC_INCOMING_CALLS = 10; // 0xa
field public static final int CALL_BLOCKING_INCOMING_WHEN_ROAMING = 5; // 0x5
field public static final int INVALID_RESULT = -1; // 0xffffffff
}
}

11
telephony/java/android/telephony/ims/stub/ImsUtImplBase.java
View File

@@ -44,52 +44,62 @@ import java.lang.annotation.RetentionPolicy;
public class ImsUtImplBase {
/**
* Bar all incoming calls. (See 3GPP TS 24.611)
* @hide
*/
public static final int CALL_BARRING_ALL_INCOMING = 1;
/**
* Bar all outgoing calls. (See 3GPP TS 24.611)
* @hide
*/
public static final int CALL_BARRING_ALL_OUTGOING = 2;
/**
* Bar all outgoing international calls. (See 3GPP TS 24.611)
* @hide
*/
public static final int CALL_BARRING_OUTGOING_INTL = 3;
/**
* Bar all outgoing international calls, excluding those to the home PLMN country
* (See 3GPP TS 24.611)
* @hide
*/
public static final int CALL_BARRING_OUTGOING_INTL_EXCL_HOME = 4;
/**
* Bar all incoming calls when roaming (See 3GPP TS 24.611)
* @hide
*/
public static final int CALL_BLOCKING_INCOMING_WHEN_ROAMING = 5;
/**
* Enable Anonymous Communication Rejection (See 3GPP TS 24.611)
* @hide
*/
public static final int CALL_BARRING_ANONYMOUS_INCOMING = 6;
/**
* Bar all incoming and outgoing calls. (See 3GPP TS 24.611)
* @hide
*/
public static final int CALL_BARRING_ALL = 7;
/**
* Bar all outgoing service requests, including calls. (See 3GPP TS 24.611)
* @hide
*/
public static final int CALL_BARRING_OUTGOING_ALL_SERVICES = 8;
/**
* Bar all incoming service requests, including calls. (See 3GPP TS 24.611)
* @hide
*/
public static final int CALL_BARRING_INCOMING_ALL_SERVICES = 9;
/**
* Bar specific incoming calls. (See 3GPP TS 24.611)
* @hide
*/
public static final int CALL_BARRING_SPECIFIC_INCOMING_CALLS = 10;
@@ -104,6 +114,7 @@ public class ImsUtImplBase {
/**
* Constant used to denote an invalid return value.
* @hide
*/
public static final int INVALID_RESULT = -1;