commit 1a72cdf6fb54c33fa8dbd98c039c895285b1e14f
author Steven Laver <lavers@google.com> Fri Feb 14 13:18:03 2020 -0800
committer Steven Laver <lavers@google.com> Fri Feb 14 13:18:03 2020 -0800
tree fe51668a5c734ea7c2096f1bfd1f5694d1b25c02
parent f1d5601df9cb0c346fb6326ebf27cc341c2eb654
parent 3b446d1dd281b1a1ab3203d4fcecd683818d21bb

Merge RP1A.200214.001

Change-Id: I9a181d73f5288994afd9dd073d39f41fa4923503

java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java

diff --git a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
index fee8454..cf76385 100644
--- a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
+++ b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
@@ -65,7 +65,7 @@
               + ", PREVIEW_SDK_INT="
               + Build.VERSION.PREVIEW_SDK_INT
               + ", RELEASE="
-              + Build.VERSION.RELEASE);
+              + Build.VERSION.RELEASE_OR_CODENAME);
       return;
     }
 

java/com/android/dialer/postcall/AndroidManifest.xml

diff --git a/java/com/android/dialer/postcall/AndroidManifest.xml b/java/com/android/dialer/postcall/AndroidManifest.xml
index 247b6e6..ca7fb71 100644
--- a/java/com/android/dialer/postcall/AndroidManifest.xml
+++ b/java/com/android/dialer/postcall/AndroidManifest.xml
@@ -21,6 +21,7 @@
   <activity
       android:name="com.android.dialer.postcall.PostCallActivity"
       android:exported="false"
+      android:theme="@style/Theme.AppCompat.Light"
       android:windowSoftInputMode="adjustResize"/>
   </application>
 </manifest>