Merge "update telecom test apps directory (NPE & RoleManager)" into tm-dev
diff --git a/testapps/src/com/android/server/telecom/testapps/TestCallList.java b/testapps/src/com/android/server/telecom/testapps/TestCallList.java
index 322c94c..32bc372 100644
--- a/testapps/src/com/android/server/telecom/testapps/TestCallList.java
+++ b/testapps/src/com/android/server/telecom/testapps/TestCallList.java
@@ -124,7 +124,7 @@
}
public Call getCall(int position) {
- return mCalls.get(position);
+ return (position < mCalls.size()) ? mCalls.get(position) : null;
}
public void addCall(Call call) {
diff --git a/testapps/src/com/android/server/telecom/testapps/TestDialerActivity.java b/testapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
index 010d6ee..f17af2c 100644
--- a/testapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
+++ b/testapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
@@ -4,6 +4,7 @@
import android.app.Activity;
import android.app.UiModeManager;
+import android.app.role.RoleManager;
import android.content.ComponentName;
import android.content.ContentValues;
import android.content.Context;
@@ -133,9 +134,11 @@
}
private void setDefault() {
- final Intent intent = new Intent(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER);
- intent.putExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME, getPackageName());
- startActivityForResult(intent, REQUEST_CODE_SET_DEFAULT_DIALER);
+ RoleManager roleManager = getSystemService(RoleManager.class);
+ if(roleManager!= null) {
+ startActivityForResult(roleManager.createRequestRoleIntent(RoleManager.ROLE_DIALER),
+ REQUEST_CODE_SET_DEFAULT_DIALER);
+ }
}
private void placeCall() {