summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2017-12-22 00:54:14 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-12-22 00:54:14 +0000
commiteffcd1f5080cb9a6f2f298f16da176ef4d15944f (patch)
treef9f7aec2ece760c5aaff4495419ac16d0a6ddac3 /core/java/android
parent058a7525025baaa1a8a1ce5922d414260a9529f6 (diff)
parent3424136a59167169b7a65a5b4ee8cdfd52235986 (diff)
Merge "Add feature flag and EMBMS bug fixes" am: 465f2916e0
am: 3424136a59 Change-Id: Iebc092e58752f32b6abfad612901ae094e083449
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/pm/PackageManager.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index ef8f84bd1690..89751dadd29d 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -2085,6 +2085,13 @@ public abstract class PackageManager {
public static final String FEATURE_TELEPHONY_EUICC = "android.hardware.telephony.euicc";
/**
+ * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device
+ * supports cell-broadcast reception using the MBMS APIs.
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_TELEPHONY_MBMS = "android.hardware.telephony.mbms";
+
+ /**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device supports connecting to USB devices
* as the USB host.