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

Commit b457973c authored by Josh Hou's avatar Josh Hou Committed by Android (Google) Code Review
Browse files

Merge "Add one item in ApplicationLocalesChanged atom" into udc-dev

parents 388ddde5 7d5fd33d

services/core/java/com/android/server/locales/AppLocaleChangedAtomRecord.java

+6 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ public final class AppLocaleChangedAtomRecord { 
    String mPrevLocales = "";

    int mStatus = FrameworkStatsLog

            .APPLICATION_LOCALES_CHANGED__STATUS__STATUS_UNSPECIFIED;



    int mCaller = FrameworkStatsLog

            .APPLICATION_LOCALES_CHANGED__CALLER__CALLER_UNKNOWN;

    AppLocaleChangedAtomRecord(int callingUid) {

        this.mCallingUid = callingUid;

    }
@@ -50,4 +51,8 @@ public final class AppLocaleChangedAtomRecord { 
    void setStatus(int status) {

        this.mStatus = status;

    }



    void setCaller(int caller) {

        this.mCaller = caller;

    }

}

services/core/java/com/android/server/locales/LocaleManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -551,7 +551,8 @@ public class LocaleManagerService extends SystemService { 
                atomRecordForMetrics.mTargetUid,

                atomRecordForMetrics.mNewLocales,

                atomRecordForMetrics.mPrevLocales,

                atomRecordForMetrics.mStatus);

                atomRecordForMetrics.mStatus,

                atomRecordForMetrics.mCaller);

    }



    /**