am 019b1f26: am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print and backup (5441745e) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -7614,6 +7614,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";
		@@ -7635,6 +7636,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";

core/java/android/content/pm/PackageManager.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -1256,6 +1256,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

services/java/com/android/server/SystemServer.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -529,7 +529,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);
		}
		@@ -778,7 +778,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) {
		@@ -786,7 +786,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) {
		@@ -872,7 +872,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) {