Merge "Add PRODUCT_ORDERED_ID" into udc-dev (a02ee524) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityInterceptorCallback.java

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -84,6 +84,7 @@ public interface ActivityInterceptorCallback {
	PERMISSION_POLICY_ORDERED_ID,		PERMISSION_POLICY_ORDERED_ID,
	VIRTUAL_DEVICE_SERVICE_ORDERED_ID,		VIRTUAL_DEVICE_SERVICE_ORDERED_ID,
	DREAM_MANAGER_ORDERED_ID,		DREAM_MANAGER_ORDERED_ID,
			PRODUCT_ORDERED_ID,
	SYSTEM_LAST_ORDERED_ID, // Update this when adding new ids		SYSTEM_LAST_ORDERED_ID, // Update this when adding new ids
	// Order Ids for mainline module services		// Order Ids for mainline module services
	MAINLINE_FIRST_ORDERED_ID,		MAINLINE_FIRST_ORDERED_ID,
	@@ -118,12 +119,19 @@ public interface ActivityInterceptorCallback {
	*/		*/
	int DREAM_MANAGER_ORDERED_ID = 4;		int DREAM_MANAGER_ORDERED_ID = 4;

			/**
			* The identifier for an interceptor which is specific to the type of android product like
			* automotive, wear, TV etc.
			* @hide
			*/
			int PRODUCT_ORDERED_ID = 5;

	/**		/**
	* The final id, used by the framework to determine the valid range of ids. Update this when		* The final id, used by the framework to determine the valid range of ids. Update this when
	* adding new ids.		* adding new ids.
	* @hide		* @hide
	*/		*/
	int SYSTEM_LAST_ORDERED_ID = DREAM_MANAGER_ORDERED_ID;		int SYSTEM_LAST_ORDERED_ID = PRODUCT_ORDERED_ID;

	/**		/**
	* The first mainline module id, used by the framework to determine the valid range of ids		* The first mainline module id, used by the framework to determine the valid range of ids