Merge "Fixing bug that prevented 'Emergency call' from being displayed" into nyc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ae64e2f..8892c24 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -68,8 +68,7 @@
android:hardwareAccelerated="true"
android:supportsRtl="true"
android:backupAgent='com.android.dialer.DialerBackupAgent'
- android:usesCleartextTraffic="false"
- android:forceDeviceEncrypted="false">
+ android:usesCleartextTraffic="false">
<meta-data android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAIBXgtCEKQ6W0PXVnW-ZVia2KmlV2AxsTw3GjAeQ" />
@@ -85,8 +84,7 @@
android:icon="@mipmap/ic_launcher_phone"
android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
android:resizeableActivity="true"
- android:encryptionAware="true"
- >
+ android:directBootAware="true">
<intent-filter>
<action android:name="android.intent.action.DIAL" />
<category android:name="android.intent.category.DEFAULT" />
@@ -281,12 +279,12 @@
<service
android:name=".calllog.CallLogNotificationsService"
- android:encryptionAware="true"
+ android:directBootAware="true"
android:exported="false"
/>
<receiver android:name=".calllog.MissedCallNotificationReceiver"
- android:encryptionAware="true">
+ android:directBootAware="true">
<intent-filter>
<action android:name="android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION" />
</intent-filter>
@@ -316,13 +314,13 @@
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboardHidden"
android:exported="false"
android:screenOrientation="nosensor"
- android:encryptionAware="true"
+ android:directBootAware="true"
android:resizeableActivity="true">
</activity>
<service android:name="com.android.incallui.InCallServiceImpl"
android:permission="android.permission.BIND_INCALL_SERVICE"
- android:encryptionAware="true" >
+ android:directBootAware="true" >
<meta-data android:name="android.telecom.IN_CALL_SERVICE_UI" android:value="true" />
<meta-data android:name="android.telecom.IN_CALL_SERVICE_RINGING"
android:value="false"/>
@@ -333,7 +331,7 @@
<!-- BroadcastReceiver for receiving Intents from Notification mechanism. -->
<receiver android:name="com.android.incallui.NotificationBroadcastReceiver"
- android:encryptionAware="true"
+ android:directBootAware="true"
android:exported="false" />
<provider
diff --git a/InCallUI/src/com/android/incallui/CallerInfoUtils.java b/InCallUI/src/com/android/incallui/CallerInfoUtils.java
index aff3956..289b652 100644
--- a/InCallUI/src/com/android/incallui/CallerInfoUtils.java
+++ b/InCallUI/src/com/android/incallui/CallerInfoUtils.java
@@ -9,13 +9,13 @@
import android.text.TextUtils;
import android.util.Log;
-import com.android.contacts.common.compat.telecom.TelecomManagerCompat;
import com.android.contacts.common.model.Contact;
import com.android.contacts.common.model.ContactLoader;
import com.android.dialer.R;
import com.android.dialer.calllog.ContactInfo;
import com.android.dialer.service.CachedNumberLookupService;
import com.android.dialer.service.CachedNumberLookupService.CachedContactInfo;
+import com.android.dialer.util.TelecomUtil;
import java.util.Arrays;
@@ -118,8 +118,7 @@
}
public static boolean isVoiceMailNumber(Context context, Call call) {
- return TelecomManagerCompat.isVoiceMailNumber(
- (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE),
+ return TelecomUtil.isVoicemailNumber(context,
call.getTelecomCall().getDetails().getAccountHandle(),
call.getNumber());
}
diff --git a/build-library.gradle b/build-library.gradle
index d353016..a2394aa 100644
--- a/build-library.gradle
+++ b/build-library.gradle
@@ -12,6 +12,11 @@
manifest.srcFile 'AndroidManifest.xml'
res.srcDirs = ['res']
}
+
+ sourceSets.androidTest {
+ java.srcDirs = ['tests/src']
+ res.srcDirs = ['test/res']
+ }
}
dependencies {
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index dfb5190..165594e 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -595,9 +595,10 @@
// In case ViewHolders were added/removed, update the expanded position if the rowIds
// match so that we can restore the correct expanded state on rebind.
mCurrentlyExpandedPosition = position;
+ views.showActions(true);
+ } else {
+ views.showActions(false);
}
-
- views.showActions(mCurrentlyExpandedPosition == position);
views.updatePhoto();
mCallLogListItemHelper.setPhoneCallDetails(views, details);
@@ -684,6 +685,14 @@
}
/**
+ * When the list is changing all stored position is no longer valid.
+ */
+ public void invalidatePositions() {
+ mCurrentlyExpandedPosition = RecyclerView.NO_POSITION;
+ mHiddenPosition = RecyclerView.NO_POSITION;
+ }
+
+ /**
* When the user clicks "undo", the hidden item is unhidden.
*/
@Override
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index 07299a2..67b72a5 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -217,6 +217,7 @@
// Return false; we did not take ownership of the cursor
return false;
}
+ mAdapter.invalidatePositions();
mAdapter.setLoading(false);
mAdapter.changeCursor(cursor);
// This will update the state of the "Clear call log" menu item.
diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java
index 8c3985b..b3ce18b 100644
--- a/src/com/android/dialer/calllog/PhoneAccountUtils.java
+++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java
@@ -59,6 +59,9 @@
return null;
}
final ComponentName componentName = ComponentName.unflattenFromString(componentString);
+ if (componentName == null) {
+ return null;
+ }
return new PhoneAccountHandle(componentName, accountId);
}
diff --git a/tests/src/com/android/dialer/calllog/PhoneAccountUtilsTest.java b/tests/src/com/android/dialer/calllog/PhoneAccountUtilsTest.java
new file mode 100644
index 0000000..f2d0856
--- /dev/null
+++ b/tests/src/com/android/dialer/calllog/PhoneAccountUtilsTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2016 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.calllog;
+
+import android.content.ComponentName;
+import android.telecom.PhoneAccountHandle;
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+
+public class PhoneAccountUtilsTest extends AndroidTestCase {
+
+ private static final String VALID_COMPONENT_NAME =
+ "com.android.dialer.calllog/com.android.dialer.calllog.PhoneAccountUtilsTest";
+ private static final String VALID_ACCOUNT_ID = "Account1";
+
+ @SmallTest
+ public void testGetAccount_CorrectParams() {
+ ComponentName correctComponentName =
+ ComponentName.unflattenFromString(VALID_COMPONENT_NAME);
+ PhoneAccountHandle correctPhoneAccountHandle = new PhoneAccountHandle(correctComponentName,
+ VALID_ACCOUNT_ID);
+
+ PhoneAccountHandle testPhoneAccountHandle =
+ PhoneAccountUtils.getAccount(VALID_COMPONENT_NAME, VALID_ACCOUNT_ID);
+
+ assertTrue(correctPhoneAccountHandle.equals(testPhoneAccountHandle));
+ }
+
+ @SmallTest
+ public void testGetAccount_ComponentStringNoClassName() {
+ final String malformedComponentName = "com.android.dialer.calllog/";
+
+ PhoneAccountHandle testPhoneAccountHandle =
+ PhoneAccountUtils.getAccount(malformedComponentName, VALID_ACCOUNT_ID);
+
+ assertNull(testPhoneAccountHandle);
+ }
+
+ @SmallTest
+ public void testGetAccount_ComponentStringInvalid() {
+ final String malformedComponentName = "com.android.dialer.calllog";
+
+ PhoneAccountHandle testPhoneAccountHandle =
+ PhoneAccountUtils.getAccount(malformedComponentName, VALID_ACCOUNT_ID);
+
+ assertNull(testPhoneAccountHandle);
+ }
+
+ @SmallTest
+ public void testGetAccount_NoComponentName() {
+ final String blankComponentName = "";
+
+ PhoneAccountHandle testPhoneAccountHandle =
+ PhoneAccountUtils.getAccount(blankComponentName, VALID_ACCOUNT_ID);
+
+ assertNull(testPhoneAccountHandle);
+ }
+
+ @SmallTest
+ public void testGetAccount_NoAccountId() {
+ final String blankAccountId = "";
+
+ PhoneAccountHandle testPhoneAccountHandle =
+ PhoneAccountUtils.getAccount(VALID_COMPONENT_NAME, blankAccountId);
+
+ assertNull(testPhoneAccountHandle);
+ }
+
+ @SmallTest
+ public void testGetAccount_NoAccountIdOrComponentName() {
+ final String blankComponentName = "";
+ final String blankAccountId = "";
+
+ PhoneAccountHandle testPhoneAccountHandle =
+ PhoneAccountUtils.getAccount(VALID_COMPONENT_NAME, blankAccountId);
+
+ assertNull(testPhoneAccountHandle);
+ }
+
+ @SmallTest
+ public void testGetAccount_NullAccountIdAndComponentName() {
+ final String blankComponentName = null;
+ final String blankAccountId = null;
+
+ PhoneAccountHandle testPhoneAccountHandle =
+ PhoneAccountUtils.getAccount(VALID_COMPONENT_NAME, blankAccountId);
+
+ assertNull(testPhoneAccountHandle);
+ }
+}