Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6d51a53 authored by Gaurav Bhola's avatar Gaurav Bhola Committed by Automerger Merge Worker
Browse files

Merge "Add PRODUCT_ORDERED_ID" into udc-dev am: a02ee524 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22268419



Change-Id: I9d78647a70cf62a93f9a90645a2bc70a6b4438be
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56295928 a02ee524

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

+9 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ public interface ActivityInterceptorCallback { 
            PERMISSION_POLICY_ORDERED_ID,

            VIRTUAL_DEVICE_SERVICE_ORDERED_ID,

            DREAM_MANAGER_ORDERED_ID,

            PRODUCT_ORDERED_ID,

            SYSTEM_LAST_ORDERED_ID, // Update this when adding new ids

            // Order Ids for mainline module services

            MAINLINE_FIRST_ORDERED_ID,
@@ -118,12 +119,19 @@ public interface ActivityInterceptorCallback { 
     */

    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

     * adding new ids.

     * @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