Merge "Change telephony-common reference from static_libs to libs"
diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java
index 463cdb1..0cf120a 100644
--- a/src/com/android/phone/TelephonyShellCommand.java
+++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -21,6 +21,8 @@
import static com.android.internal.telephony.d2d.Communicator.MESSAGE_DEVICE_BATTERY_STATE;
import static com.android.internal.telephony.d2d.Communicator.MESSAGE_DEVICE_NETWORK_COVERAGE;
+import static java.util.Map.entry;
+
import android.Manifest;
import android.content.Context;
import android.net.Uri;
@@ -61,7 +63,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -204,33 +205,32 @@
// For instance: "xxxx_string", "xxxx_string_array", etc.
// The carrier config keys in this map does not follow this convention. It is therefore not
// possible to infer the type for these keys by looking at the string.
- private static final Map<String, CcType> CC_TYPE_MAP = new HashMap<String, CcType>() {{
- put(CarrierConfigManager.Gps.KEY_A_GLONASS_POS_PROTOCOL_SELECT_STRING, CcType.STRING);
- put(CarrierConfigManager.Gps.KEY_ES_EXTENSION_SEC_STRING, CcType.STRING);
- put(CarrierConfigManager.Gps.KEY_GPS_LOCK_STRING, CcType.STRING);
- put(CarrierConfigManager.Gps.KEY_LPP_PROFILE_STRING, CcType.STRING);
- put(CarrierConfigManager.Gps.KEY_NFW_PROXY_APPS_STRING, CcType.STRING);
- put(CarrierConfigManager.Gps.KEY_SUPL_ES_STRING, CcType.STRING);
- put(CarrierConfigManager.Gps.KEY_SUPL_HOST_STRING, CcType.STRING);
- put(CarrierConfigManager.Gps.KEY_SUPL_MODE_STRING, CcType.STRING);
- put(CarrierConfigManager.Gps.KEY_SUPL_PORT_STRING, CcType.STRING);
- put(CarrierConfigManager.Gps.KEY_SUPL_VER_STRING, CcType.STRING);
- put(CarrierConfigManager.Gps.KEY_USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL_STRING,
- CcType.STRING);
- put(CarrierConfigManager.KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY,
- CcType.STRING_ARRAY);
- put(CarrierConfigManager.KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY,
- CcType.STRING_ARRAY);
- put(CarrierConfigManager.KEY_CARRIER_CALL_SCREENING_APP_STRING, CcType.STRING);
- put(CarrierConfigManager.KEY_MMS_EMAIL_GATEWAY_NUMBER_STRING, CcType.STRING);
- put(CarrierConfigManager.KEY_MMS_HTTP_PARAMS_STRING, CcType.STRING);
- put(CarrierConfigManager.KEY_MMS_NAI_SUFFIX_STRING, CcType.STRING);
- put(CarrierConfigManager.KEY_MMS_UA_PROF_TAG_NAME_STRING, CcType.STRING);
- put(CarrierConfigManager.KEY_MMS_UA_PROF_URL_STRING, CcType.STRING);
- put(CarrierConfigManager.KEY_MMS_USER_AGENT_STRING, CcType.STRING);
- put(CarrierConfigManager.KEY_RATCHET_RAT_FAMILIES, CcType.STRING_ARRAY);
- }
- };
+ private static final Map<String, CcType> CC_TYPE_MAP = Map.ofEntries(
+ entry(CarrierConfigManager.Gps.KEY_A_GLONASS_POS_PROTOCOL_SELECT_STRING,
+ CcType.STRING),
+ entry(CarrierConfigManager.Gps.KEY_ES_EXTENSION_SEC_STRING, CcType.STRING),
+ entry(CarrierConfigManager.Gps.KEY_GPS_LOCK_STRING, CcType.STRING),
+ entry(CarrierConfigManager.Gps.KEY_LPP_PROFILE_STRING, CcType.STRING),
+ entry(CarrierConfigManager.Gps.KEY_NFW_PROXY_APPS_STRING, CcType.STRING),
+ entry(CarrierConfigManager.Gps.KEY_SUPL_ES_STRING, CcType.STRING),
+ entry(CarrierConfigManager.Gps.KEY_SUPL_HOST_STRING, CcType.STRING),
+ entry(CarrierConfigManager.Gps.KEY_SUPL_MODE_STRING, CcType.STRING),
+ entry(CarrierConfigManager.Gps.KEY_SUPL_PORT_STRING, CcType.STRING),
+ entry(CarrierConfigManager.Gps.KEY_SUPL_VER_STRING, CcType.STRING),
+ entry(CarrierConfigManager.Gps.KEY_USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL_STRING,
+ CcType.STRING),
+ entry(CarrierConfigManager.KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY,
+ CcType.STRING_ARRAY),
+ entry(CarrierConfigManager.KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY,
+ CcType.STRING_ARRAY),
+ entry(CarrierConfigManager.KEY_CARRIER_CALL_SCREENING_APP_STRING, CcType.STRING),
+ entry(CarrierConfigManager.KEY_MMS_EMAIL_GATEWAY_NUMBER_STRING, CcType.STRING),
+ entry(CarrierConfigManager.KEY_MMS_HTTP_PARAMS_STRING, CcType.STRING),
+ entry(CarrierConfigManager.KEY_MMS_NAI_SUFFIX_STRING, CcType.STRING),
+ entry(CarrierConfigManager.KEY_MMS_UA_PROF_TAG_NAME_STRING, CcType.STRING),
+ entry(CarrierConfigManager.KEY_MMS_UA_PROF_URL_STRING, CcType.STRING),
+ entry(CarrierConfigManager.KEY_MMS_USER_AGENT_STRING, CcType.STRING),
+ entry(CarrierConfigManager.KEY_RATCHET_RAT_FAMILIES, CcType.STRING_ARRAY));
/**
* Map from a shorthand string to the feature tags required in registration required in order
diff --git a/src/com/android/phone/settings/RadioInfo.java b/src/com/android/phone/settings/RadioInfo.java
index 8289883..7c2c829 100644
--- a/src/com/android/phone/settings/RadioInfo.java
+++ b/src/com/android/phone/settings/RadioInfo.java
@@ -757,6 +757,7 @@
mCellInfoRefreshRateIndex = b.getInt("mCellInfoRefreshRateIndex", 0);
}
+ @SuppressWarnings("MissingSuperCall") // TODO: Fix me
@Override
protected void onSaveInstanceState(Bundle outState) {
outState.putString("mPingHostnameResultV4", mPingHostnameResultV4);
diff --git a/src/com/android/phone/slicestore/SliceStore.java b/src/com/android/phone/slicestore/SliceStore.java
index 7d098ca..20245f6 100644
--- a/src/com/android/phone/slicestore/SliceStore.java
+++ b/src/com/android/phone/slicestore/SliceStore.java
@@ -233,9 +233,8 @@
logd("Purchase premium capability request was not made on the default data "
+ "subscription for capability: "
+ TelephonyManager.convertPremiumCapabilityToString(capability));
- // TODO: change to RESULT_NOT_DEFAULT_DATA after ag/20196642 is merged
SliceStore.getInstance(phoneId).sendPurchaseResultFromSliceStore(capability,
- TelephonyManager.PURCHASE_PREMIUM_CAPABILITY_RESULT_REQUEST_FAILED,
+ TelephonyManager.PURCHASE_PREMIUM_CAPABILITY_RESULT_NOT_DEFAULT_DATA,
false);
break;
}
@@ -338,8 +337,10 @@
+ " unsupported by the carrier.");
return false;
}
- if (!arePremiumCapabilitiesEnabledByUser()) {
- logd("Premium capabilities disabled by the user.");
+ if (!isDefaultData()) {
+ logd("Premium capability "
+ + TelephonyManager.convertPremiumCapabilityToString(capability)
+ + " unavailable on the non-default data subscription.");
return false;
}
logd("Premium capability "
@@ -373,9 +374,9 @@
onComplete);
return;
}
- if (!arePremiumCapabilitiesEnabledByUser()) {
+ if (!isDefaultData()) {
sendPurchaseResult(capability,
- TelephonyManager.PURCHASE_PREMIUM_CAPABILITY_RESULT_USER_DISABLED,
+ TelephonyManager.PURCHASE_PREMIUM_CAPABILITY_RESULT_NOT_DEFAULT_DATA,
onComplete);
return;
}
@@ -392,7 +393,7 @@
onComplete);
return;
}
- if (mPhone.getServiceState().getDataNetworkType() != TelephonyManager.NETWORK_TYPE_NR) {
+ if (!isNetworkAvailable()) {
sendPurchaseResult(capability,
TelephonyManager.PURCHASE_PREMIUM_CAPABILITY_RESULT_NETWORK_NOT_AVAILABLE,
onComplete);
@@ -583,9 +584,8 @@
& TelephonyManager.NETWORK_TYPE_BITMASK_NR) != 0;
}
- private boolean arePremiumCapabilitiesEnabledByUser() {
- // TODO(b/245882396): Create and set user settings
- return false;
+ private boolean isDefaultData() {
+ return mPhone.getSubId() == SubscriptionManager.getDefaultDataSubscriptionId();
}
private boolean isSlicingConfigActive(@TelephonyManager.PremiumCapability int capability) {
@@ -609,6 +609,20 @@
return NetworkSliceInfo.SLICE_SERVICE_TYPE_NONE;
}
+ private boolean isNetworkAvailable() {
+ // TODO (b/251558673): Create a listener for data network type changed to dismiss
+ // notification and activity when the network is no longer available.
+ switch (mPhone.getServiceState().getDataNetworkType()) {
+ case TelephonyManager.NETWORK_TYPE_NR:
+ return true;
+ case TelephonyManager.NETWORK_TYPE_LTE:
+ case TelephonyManager.NETWORK_TYPE_LTE_CA:
+ return getCarrierConfigs().getBoolean(
+ CarrierConfigManager.KEY_PREMIUM_CAPABILITY_SUPPORTED_ON_LTE_BOOL);
+ }
+ return false;
+ }
+
private boolean isNetworkCongested(@TelephonyManager.PremiumCapability int capability) {
// TODO: Implement TS43
return true;
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index e369d37..65852d9 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -78,12 +78,12 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Queue;
+import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import java.util.regex.Pattern;
@@ -2555,9 +2555,7 @@
return;
}
- c.sendMessages(new HashSet<Communicator.Message>() {{
- add(new Communicator.Message(message, value));
- }});
+ c.sendMessages(Set.of(new Communicator.Message(message, value)));
});
}
diff --git a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java
index 3d83a4c..edb3c47 100644
--- a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java
+++ b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java
@@ -58,9 +58,8 @@
import java.util.concurrent.ConcurrentHashMap;
public class EmbmsSampleDownloadService extends Service {
- private static final Set<String> ALLOWED_PACKAGES = new HashSet<String>() {{
- add("com.android.phone.testapps.embmsdownload");
- }};
+ private static final Set<String> ALLOWED_PACKAGES = Set.of(
+ "com.android.phone.testapps.embmsdownload");
private static final String LOG_TAG = "EmbmsSampleDownload";
private static final long INITIALIZATION_DELAY = 200;
diff --git a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsTestStreamingService.java b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsTestStreamingService.java
index f50536c..58afe98 100644
--- a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsTestStreamingService.java
+++ b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsTestStreamingService.java
@@ -35,15 +35,13 @@
import java.util.Arrays;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class EmbmsTestStreamingService extends Service {
- private static final Set<String> ALLOWED_PACKAGES = new HashSet<String>() {{
- add("com.android.phone.testapps.embmsfrontend");
- }};
+ private static final Set<String> ALLOWED_PACKAGES = Set.of(
+ "com.android.phone.testapps.embmsfrontend");
private static final String TAG = "EmbmsTestStreaming";
diff --git a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/FileServiceRepository.java b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/FileServiceRepository.java
index 27911f6..fe345f3 100644
--- a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/FileServiceRepository.java
+++ b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/FileServiceRepository.java
@@ -81,14 +81,10 @@
private void createFileService(String className, Uri... filesIncluded) {
sServiceIdCounter++;
String id = "FileServiceId[" + sServiceIdCounter + "]";
- List<Locale> locales = new ArrayList<Locale>(2) {{
- add(Locale.US);
- add(Locale.UK);
- }};
- Map<Locale, String> localeDict = new HashMap<Locale, String>() {{
- put(Locale.US, "File Source " + sServiceIdCounter);
- put(Locale.UK, "File Source with extra vowels " + sServiceIdCounter);
- }};
+ List<Locale> locales = List.of(Locale.US, Locale.UK);
+ Map<Locale, String> localeDict = Map.of(
+ Locale.US, "File Source " + sServiceIdCounter,
+ Locale.UK, "File Source with extra vowels " + sServiceIdCounter);
List<FileInfo> fileInfos = Arrays.stream(filesIncluded)
.map(this::getFileInfoForUri)
.collect(Collectors.toList());
diff --git a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/StreamingServiceRepository.java b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/StreamingServiceRepository.java
index e1a12e3..e49dea5 100644
--- a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/StreamingServiceRepository.java
+++ b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/StreamingServiceRepository.java
@@ -19,7 +19,6 @@
import android.net.Uri;
import android.telephony.mbms.StreamingServiceInfo;
-import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -61,14 +60,10 @@
private static void createStreamingService(String className) {
sServiceIdCounter++;
String id = "StreamingServiceId[" + sServiceIdCounter + "]";
- Map<Locale, String> localeDict = new HashMap<Locale, String>() {{
- put(Locale.US, "Entertainment Source " + sServiceIdCounter);
- put(Locale.CANADA, "Entertainment Source, eh?" + sServiceIdCounter);
- }};
- List<Locale> locales = new ArrayList<Locale>() {{
- add(Locale.CANADA);
- add(Locale.US);
- }};
+ Map<Locale, String> localeDict = Map.of(
+ Locale.US, "Entertainment Source " + sServiceIdCounter,
+ Locale.CANADA, "Entertainment Source, eh?" + sServiceIdCounter);
+ List<Locale> locales = List.of(Locale.CANADA, Locale.US);
StreamingServiceInfo info = new StreamingServiceInfo(localeDict, className, locales,
id, new Date(System.currentTimeMillis() - 10000),
new Date(System.currentTimeMillis() + 10000));
diff --git a/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/ParameterParser.java b/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/ParameterParser.java
index ccb5639..28408f9 100644
--- a/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/ParameterParser.java
+++ b/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/ParameterParser.java
@@ -25,7 +25,6 @@
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor;
@@ -44,15 +43,13 @@
}
private final Context mContext;
- private final Map<Class, Function<String, Object>> mParsers =
- new HashMap<Class, Function<String, Object>>() {{
- put(PhoneNumberRange.class, ParameterParser::parsePhoneNumberRange);
- put(Executor.class, s -> parseExecutor(s));
- put(NumberVerificationCallback.class, s -> parseNumberVerificationCallback(s));
- put(Consumer.class, s -> parseConsumer(s));
- put(List.class, s -> parseList(s));
- put(RadioAccessSpecifier.class, s -> parseRadioAccessSpecifier(s));
- }};
+ private final Map<Class, Function<String, Object>> mParsers = Map.of(
+ PhoneNumberRange.class, ParameterParser::parsePhoneNumberRange,
+ Executor.class, s -> parseExecutor(s),
+ NumberVerificationCallback.class, s -> parseNumberVerificationCallback(s),
+ Consumer.class, s -> parseConsumer(s),
+ List.class, s -> parseList(s),
+ RadioAccessSpecifier.class, s -> parseRadioAccessSpecifier(s));
private ParameterParser(Context context) {
mContext = context;
diff --git a/testapps/TestRcsApp/TestApp/src/com/google/android/sample/rcsclient/FileUploadActivity.java b/testapps/TestRcsApp/TestApp/src/com/google/android/sample/rcsclient/FileUploadActivity.java
index b9078f8..cfb75bc 100644
--- a/testapps/TestRcsApp/TestApp/src/com/google/android/sample/rcsclient/FileUploadActivity.java
+++ b/testapps/TestRcsApp/TestApp/src/com/google/android/sample/rcsclient/FileUploadActivity.java
@@ -189,6 +189,7 @@
});
}
+ @SuppressWarnings("MissingSuperCall") // TODO: fix me
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) {