Josh Hou 6bbe735831 [automerger skipped] Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef83795e am: 406abc4d62 -s ours am: 576564873f -s ours am: 0333fd29a5 -s ours ...

am skip reason: Merged-In I2e25a308bcba6ea0edee89c7a78465f766bdbeac with SHA-1 5d7d1665fe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21152842

Change-Id: I6026bbef3f00a9adff5b7f0b566fb707116a5584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2023-02-02 02:58:04 +00:00

libs

Use androidx.window from prebuilt.

2022-04-14 09:55:36 +00:00

protos

Move fuelgauge_usage_state.proto into fuelgauge folder.

2022-12-02 15:00:58 +08:00

res

Merge "No screen lock notification"

2023-02-02 02:23:16 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

2022-12-07 11:47:43 +00:00

res-product

Update fingerprint introduction string

2023-01-31 05:28:42 +00:00

src/com/android/settings

Merge "Replace SystemUser checks with MainUser."

2023-02-02 02:51:26 +00:00

tests

Merge "Replace SystemUser checks with MainUser."

2023-02-02 02:51:26 +00:00

.gitignore

…

Android.bp

Load app usage events data in the hourly job.

2022-12-15 06:32:54 +00:00

AndroidManifest.xml

Merge "Implement “Set up Face or Fingerprint Unlock first” page"

2023-01-31 07:49:22 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

color-check-baseline.xml

Fix checkcolor_hook error

2023-01-12 22:00:44 +08:00

NOTICE

…

OWNERS

Merge "Fixes resource file exemption."

2023-01-30 20:28:12 +00:00

PREUPLOAD.cfg

Migrate stringslint.py to AyeAye.

2022-08-03 13:52:10 -06:00

proguard.flags

Refine Settings proguard rules

2022-10-06 09:10:38 -07:00

TEST_MAPPING

Add AppStoragePreference for Spa

2022-10-13 17:21:08 +08:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%