Merge 25Q1 (ab/12770256) to aosp-main-future
Bug: 385190204
Merged-In: I0b2b75f5a2532aaba0e0f53a1e32bcb544e4638c
Change-Id: I470ba852329026c0b7d847608968b4334b69a49d
diff --git a/proguard.flags b/proguard.flags
index 7c71a15..9d326ff 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,7 +1,9 @@
--verbose
--keep @com.android.internal.annotations.VisibleForTesting class *
+# TODO(b/373579455): Evaluate if <init> needs to be kept.
+-keep @com.android.internal.annotations.VisibleForTesting class * {
+ void <init>();
+}
-keep public class * extends android.widget.ListView {
- public *;
+ public *;
}
-keep class com.android.server.telecom.TelecomSystem {
*;
diff --git a/tests/src/com/android/server/telecom/tests/CallLogManagerTest.java b/tests/src/com/android/server/telecom/tests/CallLogManagerTest.java
index cb04dc3..fcb8966 100644
--- a/tests/src/com/android/server/telecom/tests/CallLogManagerTest.java
+++ b/tests/src/com/android/server/telecom/tests/CallLogManagerTest.java
@@ -588,7 +588,8 @@
assertEquals(insertedValues.getAsString(CallLog.Calls.NUMBER),
TEL_PHONEHANDLE.getSchemeSpecificPart());
assertEquals(insertedValues.getAsString(CallLog.Calls.POST_DIAL_DIGITS), POST_DIAL_STRING);
- String expectedNumber = PhoneNumberUtils.formatNumber(VIA_NUMBER_STRING, "US");
+ String expectedNumber = PhoneNumberUtils.formatNumber(VIA_NUMBER_STRING,
+ mCallLogManager.getCountryIso());
assertEquals(insertedValues.getAsString(Calls.VIA_NUMBER), expectedNumber);
}