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

Merge "Add support to pass password in Call barring"

Browse Source 
am: 92e0799d58

Change-Id: I6e94f8cefc8ad614d642fad32296b2e45fc6ec42
This commit is contained in:
Sarah Chin
2020-01-22 19:12:35 -08:00
committed by android-build-merger
parent 45e0caf5dc 92e0799d58
commit 7704c379e5
5 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -10649,6 +10649,7 @@ package android.telephony.ims.stub {
method public int transact(android.os.Bundle);
method public int updateCallBarring(int, int, String[]);
method public int updateCallBarringForServiceClass(int, int, String[], int);
method public int updateCallBarringWithPassword(int, int, @Nullable String[], int, @NonNull String);
method public int updateCallForward(int, int, String, int, int);
method public int updateCallWaiting(boolean, int);
method public int updateClip(boolean);

1
api/test-current.txt
View File

@@ -3933,6 +3933,7 @@ package android.telephony.ims.stub {
method public int transact(android.os.Bundle);
method public int updateCallBarring(int, int, String[]);
method public int updateCallBarringForServiceClass(int, int, String[], int);
method public int updateCallBarringWithPassword(int, int, @Nullable String[], int, @NonNull String);
method public int updateCallForward(int, int, String, int, int);
method public int updateCallWaiting(boolean, int);
method public int updateClip(boolean);

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

@@ -17,6 +17,8 @@
package android.telephony.ims.stub;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.os.Bundle;
@@ -206,6 +208,13 @@ public class ImsUtImplBase {
return ImsUtImplBase.this.updateCallBarringForServiceClass(
cbType, action, barrList, serviceClass);
}
@Override
public int updateCallBarringWithPassword(int cbType, int action, String[] barrList,
int serviceClass, String password) throws RemoteException {
return ImsUtImplBase.this.updateCallBarringWithPassword(
cbType, action, barrList, serviceClass, password);
}
};
/**
@@ -327,6 +336,14 @@ public class ImsUtImplBase {
return -1;
}
/**
* Updates the configuration of the call barring for specified service class with password.
*/
public int updateCallBarringWithPassword(int cbType, int action, @Nullable String[] barrList,
int serviceClass, @NonNull String password) {
return -1;
}
/**
* Updates the configuration of the call forward.
*/

6
telephony/java/com/android/ims/ImsUtInterface.java
View File

@@ -165,6 +165,12 @@ public interface ImsUtInterface {
public void updateCallBarring(int cbType, int action, Message result,
String[] barrList, int serviceClass);
/**
* Modifies the configuration of the call barring for specified service class with password.
*/
public void updateCallBarring(int cbType, int action, Message result,
String[] barrList, int serviceClass, String password);
/**
* Modifies the configuration of the call forward.
*/

6
telephony/java/com/android/ims/internal/IImsUt.aidl
View File

@@ -122,4 +122,10 @@ interface IImsUt {
*/
int updateCallBarringForServiceClass(int cbType, int action, in String[] barrList,
int serviceClass);
/**
* Updates the configuration of the call barring for specified service class with password.
*/
int updateCallBarringWithPassword(int cbType, int action, in String[] barrList,
int serviceClass, String password);
}