drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3d9bcb90: Create FEATURE_ constants for print and backup

Browse Source 
* commit '3d9bcb90ee6c0ffff93642539ae64fb672c7f14a':
  Create FEATURE_ constants for print and backup
This commit is contained in:
Adam Lesinski
2014-02-18 22:57:37 +00:00
committed by Android Git Automerger
parent 37d894a42b 3d9bcb90ee
commit 2ea983a567
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@ -7290,6 +7290,7 @@ package android.content.pm {
field public static final java.lang.String EXTRA_VERIFICATION_RESULT = "android.content.pm.extra.VERIFICATION_RESULT";
field public static final java.lang.String FEATURE_APP_WIDGETS = "android.software.app_widgets";
field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency";
field public static final java.lang.String FEATURE_BACKUP = "android.software.backup";
field public static final java.lang.String FEATURE_BLUETOOTH = "android.hardware.bluetooth";
field public static final java.lang.String FEATURE_BLUETOOTH_LE = "android.hardware.bluetooth_le";
field public static final java.lang.String FEATURE_CAMERA = "android.hardware.camera";
@ -7311,6 +7312,7 @@ package android.content.pm {
field public static final java.lang.String FEATURE_MICROPHONE = "android.hardware.microphone";
field public static final java.lang.String FEATURE_NFC = "android.hardware.nfc";
field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce";
field public static final java.lang.String FEATURE_PRINTING = "android.software.print";
field public static final java.lang.String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape";
field public static final java.lang.String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait";
field public static final java.lang.String FEATURE_SENSOR_ACCELEROMETER = "android.hardware.sensor.accelerometer";

14
core/java/android/content/pm/PackageManager.java
View File

@ -1248,6 +1248,20 @@ public abstract class PackageManager {
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_TELEVISION = "android.hardware.type.television";
/**
* Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:
* The device supports printing.
*/
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_PRINTING = "android.software.print";
/**
* Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:
* The device can perform backup and restore operations on installed applications.
*/
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_BACKUP = "android.software.backup";
/**
* Action to external storage service to clean out removed apps.
* @hide

8
services/java/com/android/server/SystemServer.java
View File

@ -533,7 +533,7 @@ public final class SystemServer {
}
try {
if (pm.hasSystemFeature("android.software.device_admin")) {
if (pm.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN)) {
mSystemServiceManager.startServiceIfExists(
DEVICE_POLICY_MANAGER_SERVICE_CLASS);
}
@ -785,7 +785,7 @@ public final class SystemServer {
if (!disableNonCoreServices) {
try {
if (pm.hasSystemFeature("android.software.backup")) {
if (pm.hasSystemFeature(PackageManager.FEATURE_BACKUP)) {
mSystemServiceManager.startServiceIfExists(BACKUP_MANAGER_SERVICE_CLASS);
}
} catch (Throwable e) {
@ -793,7 +793,7 @@ public final class SystemServer {
}
try {
if (pm.hasSystemFeature("android.software.app_widgets")) {
if (pm.hasSystemFeature(PackageManager.FEATURE_APP_WIDGETS)) {
mSystemServiceManager.startServiceIfExists(APPWIDGET_SERVICE_CLASS);
}
} catch (Throwable e) {
@ -879,7 +879,7 @@ public final class SystemServer {
}
try {
if (pm.hasSystemFeature("android.software.print")) {
if (pm.hasSystemFeature(PackageManager.FEATURE_PRINTING)) {
mSystemServiceManager.startServiceIfExists(PRINT_MANAGER_SERVICE_CLASS);
}
} catch (Throwable e) {