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

Commit 81d71f2c authored by Nishant Singh's avatar Nishant Singh Committed by Automerger Merge Worker
Browse files

Merge "Pass correct argument to handleIncomingUser." into tm-dev am: fd5b2cea 

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



Change-Id: Ic7b104b78b22272b145147d2be255303177b00cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4c6a2d9b fd5b2cea

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

+2 −2
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ public class LocaleManagerService extends SystemService { 
            userId = mActivityManagerInternal.handleIncomingUser(

                    Binder.getCallingPid(), Binder.getCallingUid(), userId,

                    false /* allowAll */, ActivityManagerInternal.ALLOW_NON_FULL,

                    "setApplicationLocales", appPackageName);

                    "setApplicationLocales", /* callerPackage= */ null);



            // This function handles two types of set operations:

            // 1.) A normal, non-privileged app setting its own locale.
@@ -355,7 +355,7 @@ public class LocaleManagerService extends SystemService { 
        userId = mActivityManagerInternal.handleIncomingUser(

                Binder.getCallingPid(), Binder.getCallingUid(), userId,

                false /* allowAll */, ActivityManagerInternal.ALLOW_NON_FULL,

                "getApplicationLocales", appPackageName);

                "getApplicationLocales", /* callerPackage= */ null);



        // This function handles three types of query operations:

        // 1.) A normal, non-privileged app querying its own locale.