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

Commit 7b54eda6 authored by Josh Hou's avatar Josh Hou Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I30d7d5c0868226d3023c1ab4d7043cfeae42c1b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 370f87fb b457973c

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);

    }



    /**