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

Commit 7914797d authored by Jerry Zhang's avatar Jerry Zhang
Browse files

Fix build breakage caused by proto conflict 

Two proto constants were merged at the same time,
causing a conflict.

Test: none
Change-Id: If429fc28d8f2c37c19945a7cffe1147770ea447d
parent 5f2a4ef7

proto/src/metrics_constants.proto

+5 −5
Original line number Diff line number Diff line
@@ -5173,11 +5173,6 @@ message MetricsEvent { 
    // OS: P

    AUTOFILL_INVALID_PERMISSION = 1289;



    // OPEN: Settings->Connected Devices->USB->(click on details link)

    // CATEGORY: SETTINGS

    // OS: P

    USB_DEVICE_DETAILS = 1290;



    // OPEN: QS Alarm tile shown

    // ACTION: QS Alarm tile tapped

    //  SUBTYPE: 0 is off, 1 is on
@@ -5185,6 +5180,11 @@ message MetricsEvent { 
    // OS: P

    QS_ALARM = 1290;



    // OPEN: Settings->Connected Devices->USB->(click on details link)

    // CATEGORY: SETTINGS

    // OS: P

    USB_DEVICE_DETAILS = 1291;



    // ---- End P Constants, all P constants go above this line ----

    // Add new aosp constants above this line.

    // END OF AOSP CONSTANTS