Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002' into HEAD
"AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002"
* tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002':
Compilation fix
Compiltaion fix for Contacts
Change-Id: I77ab0de054fbd4c4092722e56bdc647c688c1f4f
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index 8b80a08..2a50a12 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -227,7 +227,7 @@
if (0 != mSimMaxCount[subscription]) {
return mSimMaxCount[subscription];
}
- long[] subId = SubscriptionManager.getSubId(subscription);
+ int[] subId = SubscriptionManager.getSubId(subscription);
try {
IIccPhoneBook iccIpb = IIccPhoneBook.Stub.asInterface(
ServiceManager.getService("simphonebook"));
@@ -690,7 +690,7 @@
int count = 0;
Cursor c = null;
Uri iccUri;
- long[] subId = SubscriptionManager.getSubId(subscription);
+ int[] subId = SubscriptionManager.getSubId(subscription);
if (!TelephonyManager.getDefault().isMultiSimEnabled()) {
iccUri = Uri.parse(SimContactsConstants.SIM_URI);
} else {
diff --git a/src/com/android/contacts/editor/MultiPickContactActivity.java b/src/com/android/contacts/editor/MultiPickContactActivity.java
index 33788eb..a54113b 100755
--- a/src/com/android/contacts/editor/MultiPickContactActivity.java
+++ b/src/com/android/contacts/editor/MultiPickContactActivity.java
@@ -901,7 +901,7 @@
String selection = null;
int slot = getIntent().getIntExtra(SimContactsConstants.SUB,
SimContactsConstants.SUB_INVALID);
- long[] subIds = SubscriptionManager.getSubId(slot);
+ int[] subIds = SubscriptionManager.getSubId(slot);
if (SimContactsConstants.SUB_INVALID != slot
&& subIds != null && subIds.length > 0) {
selection = Calls.PHONE_ACCOUNT_ID + "=" + Long.toString(subIds[0]);
@@ -1319,7 +1319,7 @@
int slot = SimContactsConstants.SUB_INVALID;
if (subId != null && !subId.equals("E")) {
- slot = SubscriptionManager.getSlotId(Long.parseLong(subId));
+ slot = SubscriptionManager.getSlotId(Integer.parseInt(subId));
}
// set slot
subSlotText.setText(MoreContactUtils.getMultiSimAliasesName(
@@ -1433,7 +1433,7 @@
&& subscription != SimContactsConstants.SUB_2) {
return uri;
}
- long[] subId = SubscriptionManager.getSubId(subscription);
+ int[] subId = SubscriptionManager.getSubId(subscription);
if (subId != null && TelephonyManager.getDefault().isMultiSimEnabled()) {
uri = Uri.parse(SimContactsConstants.SIM_SUB_URI + subId[0]);
}
diff --git a/tests/src/com/android/contacts/activities/PeopleActivityTest.java b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
index 84dc748..9dc3f44 100644
--- a/tests/src/com/android/contacts/activities/PeopleActivityTest.java
+++ b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
@@ -70,7 +70,7 @@
{
static {
// AsyncTask class needs to be initialized on the main thread.
- AsyncTask.init();
+ //AsyncTask.init();
}
private static final String TEST_ACCOUNT = "testAccount";
diff --git a/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java b/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
index 5932c87..e2c274d 100644
--- a/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
+++ b/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
@@ -53,7 +53,7 @@
static {
// AsyncTask class needs to be initialized on the main thread.
- AsyncTask.init();
+ //AsyncTask.init();
}
private static final Uri CONTACT_URI = ContentUris.withAppendedId(Contacts.CONTENT_URI, 13);