Merge changes Iaf6e217d,Ib22e33de,If9fd6ca9
am: 65aa3b3677
Change-Id: I8fbd63b32623a3cd7cc35051aaa110c88a8b2313
diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java b/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
index 2544483..e30623b 100644
--- a/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
@@ -121,7 +121,8 @@
if (notification.getId() != VisualVoicemailNotifier.NOTIFICATION_ID) {
continue;
}
- if (!notification.getTag().startsWith(VisualVoicemailNotifier.NOTIFICATION_TAG_PREFIX)) {
+ if (TextUtils.isEmpty(notification.getTag())
+ || !notification.getTag().startsWith(VisualVoicemailNotifier.NOTIFICATION_TAG_PREFIX)) {
continue;
}
String uri =
diff --git a/java/com/android/dialer/app/list/ListsFragment.java b/java/com/android/dialer/app/list/ListsFragment.java
index 362997a..05c647a 100644
--- a/java/com/android/dialer/app/list/ListsFragment.java
+++ b/java/com/android/dialer/app/list/ListsFragment.java
@@ -203,7 +203,11 @@
mPrefs.getBoolean(
VisualVoicemailEnabledChecker.PREF_KEY_HAS_ACTIVE_VOICEMAIL_PROVIDER, false));
mViewPager.setAdapter(mAdapter);
- mViewPager.setOffscreenPageLimit(DialtactsPagerAdapter.TAB_COUNT_WITH_VOICEMAIL - 1);
+
+ // This is deliberate. See cl/172018946 for the app startup implications of using 1 here
+ // versus loading more fragments upfront.
+ mViewPager.setOffscreenPageLimit(1);
+
mViewPager.addOnPageChangeListener(this);
showTab(DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL);
diff --git a/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java b/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java
index 784daa8..eb2e92e 100644
--- a/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java
+++ b/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java
@@ -17,7 +17,6 @@
package com.android.incallui.videotech.lightbringer;
import android.content.Context;
-import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.telecom.Call;
@@ -57,11 +56,6 @@
@Override
public boolean isAvailable(Context context) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
- LogUtil.v("LightbringerTech.isAvailable", "upgrade unavailable, only supported on N+");
- return false;
- }
-
if (!ConfigProviderBindings.get(context)
.getBoolean("enable_lightbringer_video_upgrade", true)) {
LogUtil.v("LightbringerTech.isAvailable", "upgrade disabled by flag");