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

Commit fd5b2cea authored by Nishant Singh's avatar Nishant Singh Committed by Android (Google) Code Review
Browse files

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

parents ced5f2c0 65beb351

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.