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

Commit b8175ad3 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t... 

am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev

* commit 'c02ddd6a':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
parents 1229d266 c02ddd6a

services/core/java/com/android/server/MountService.java

+5 −0
Original line number Diff line number Diff line
@@ -860,6 +860,11 @@ class MountService extends IMountService.Stub 
        } catch (RemoteException e) {

            Slog.e(TAG, "Error setting system locale from mount service", e);

        }



        // Temporary workaround for http://b/17945169.

        Slog.d(TAG, "Setting system properties to " + systemLocale + " from mount service");

        SystemProperties.set("persist.sys.language", locale.getLanguage());

        SystemProperties.set("persist.sys.country", locale.getCountry());

    }



    /**