Bill Yi
6cf6175ec3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: Ib3d599dccb4076c42bc05cfbdec0036e72ec9177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 20:44:09 +00:00
Bill Yi
e289b0f368
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a1027d900d021590709e82299a9dee0533e380d
2022-09-29 18:51:56 -07:00
TreeHugger Robot
6a6678facd
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836 -s ours am: 785e311159 -s ours am: f2f310cdf1 -s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I0d7b3e60ee881745125ddce0245f3376b9040640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:53:57 +00:00
Milton Wu
b5f2fe917e
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb am: 3f02770332 -s ours am: fcffcdd692 -s ours am: 34d43eb70f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I8bb019a8d0ee5d66d1d07c5561c2ce9c224c713e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:53:52 +00:00
TreeHugger Robot
f2f310cdf1
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836 -s ours am: 785e311159 -s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I26feba1ff77c83e08c57817dd36574b7b7218472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:24:53 +00:00
Milton Wu
34d43eb70f
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb am: 3f02770332 -s ours am: fcffcdd692 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: Ib0958dfb6feb7edf36142450b8998a079ede6277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:24:49 +00:00
TreeHugger Robot
785e311159
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836 -s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: Ia4267770be69e08e5e4094a092659b8e1d4625e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:28 +00:00
Milton Wu
fcffcdd692
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb am: 3f02770332 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I5d4a93f2029eb1ab012fb421874882a5ad699459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:27 +00:00
TreeHugger Robot
3a28ab401b
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7 -s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: Idc0a3eff48a1d461253d5609ada7a2f8f1489ccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:56:43 +00:00
Milton Wu
6cfd8c6aa3
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb 2p: 353e941920 am: 9e76d2c1fb -s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I18f043a59751014380a81c8cdd25d71b9c6ff289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:56:40 +00:00
TreeHugger Robot
7429f710f7
Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev
...
* changes:
[automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb 2p: 353e941920
[automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
2022-09-28 22:37:17 +00:00
TreeHugger Robot
80f5fd3836
Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev
...
* changes:
[automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
2022-09-28 22:37:17 +00:00
Milton Wu
98b4b76031
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9 -s ours am: 5561341091 -s ours am: 8da95c29a9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: I6479bd21413acdd463881ddea502d84217f85da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:22:04 +00:00
Milton Wu
8da95c29a9
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9 -s ours am: 5561341091 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: If075061207ed359f26ec3a597792329d77bc537a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:53:17 +00:00
Milton Wu
5561341091
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: Icfaa44c53c3f78950a453879f34d27ff8aa88bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:42:15 +00:00
Milton Wu
0c46b7840d
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac -s ours am: ed094b353b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: I44fd4f0b1790fd8a794fd64715e1deb424cf957b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:40:33 +00:00
TreeHugger Robot
d6b7661b56
Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: Ide91525eb2f13fa28d9d2f84c8748855ec34ad9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:40:15 +00:00
Milton Wu
23e9e62a23
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: Ie15c1ba2581ec94323d365e55e623e355fc26069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:40:12 +00:00
Milton Wu
ed094b353b
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: I911ef7db2860485823aa86c8c79e037b3db45389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:39:23 +00:00
TreeHugger Robot
eaabdee25c
Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev
2022-09-28 03:05:56 +00:00
Arc Wang
9f04b02571
Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8 am: 99cb9d91f1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981
Change-Id: Ib9b0b40a546d3eecb11535e28841a668e0fd3931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 02:59:15 +00:00
Arc Wang
99cb9d91f1
Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981
Change-Id: I2978b2a1b25c04d4cbac9022c3dc3ec651206bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 02:01:16 +00:00
Arc Wang
6626e50dd8
Merge "Fix USB OTG hot plug out nndexOutOfBoundsException"
2022-09-28 01:22:51 +00:00
Bill Yi
0e38635a4d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035804
Change-Id: Idfedb5270e175e11962cea5feac0186c754eaa2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-27 17:55:44 +00:00
Bill Yi
d267bd8655
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035804
Change-Id: Icfb4d78c4245679bc0c62b696e23263a9183d353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-27 17:55:34 +00:00
Bill Yi
0928d5bbaf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035381
Change-Id: Ibd385a535680b4674adc83a4650cc86f8be59192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-27 17:55:18 +00:00
Bill Yi
dbe25724d6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-27 17:11:14 +00:00
ot904699
aa76620073
Fix USB OTG hot plug out nndexOutOfBoundsException
...
Open Settings, then open Storage , plug in USB OTG with Disk, select Disk, open Files, play a video, press the back key, hot plug out USB OTG, the IndexOutOfBoundsException will happen
The root cause is when received the onVolumeStateChanged in StorageEventListener in StorageDashboardFragment, the volumeInfo
status is VolumeInfo.STATE_UNMOUNTED or VolumeInfo.STATE_EJECTING, mSelectedStorageEntry set to changedStorageEntry, cause the fail.
This is a fix for CL 225095144 bug.
Bug: 247737688
Test: Manual
Change-Id: I9535c49d65c42a8dfa8ccf4e271ae973d944d4b9
2022-09-26 08:15:48 +00:00
Bill Yi
9c58f1e6d5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e -s ours am: 1b68f107cf -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I220d0e40fe818db047ad044eaebf353b4c3a9453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:41:25 +00:00
Bill Yi
fc1eb27c1c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94 -s ours am: fa5c30b611 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: Ia71f310fee9bcaacc1a85cbdfa67d4a7410753b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:41:10 +00:00
Bill Yi
687ba7a903
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294 -s ours am: 44f10293dd -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: Ic109f908fef58e17b1d2bcd2538f33140bcd5330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:40:50 +00:00
Bill Yi
7687eee85f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886 -s ours am: b9925d6346 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: Ie1172379e741d3e5062ea530ad2ef3af7cd44ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:40:25 +00:00
Bill Yi
1b68f107cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I39d93229b5aa9287c75457e4ff245d24a028b157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:24:36 +00:00
Bill Yi
fa5c30b611
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I84b37db6b17af0d646b7855a3e2243ef4b917dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:24:19 +00:00
Bill Yi
44f10293dd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: Id841745bd202fd7524b6707bd44260d4160cc22c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:23:59 +00:00
Bill Yi
b9925d6346
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: I41d225d2cf538ae26bdfc4a8a0aa65fddc36c8aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:23:36 +00:00
Bill Yi
5419d3f04e
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-26 03:07:25 +00:00
Bill Yi
2a57051294
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-26 03:07:25 +00:00
Treehugger Robot
41e0e6fea7
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: Iaeef4967d528aca3e4d66f98952635cb97ed9350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 09:27:24 +00:00
Treehugger Robot
61d8dee2a0
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: Ib4c2a39144bfe7870f39e5797cf42c75b9a49572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 08:54:52 +00:00
Treehugger Robot
4d5951c6ef
Merge "Settings: Protect sensitive data on the about phone"
2022-09-24 08:23:53 +00:00
Bill Yi
a068e61a94
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0ad02e480a4a792ddeaa12e07a12f968659d3faa
2022-09-23 11:04:43 -07:00
Bill Yi
53322b1886
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4a5a43e5ad52047121da5fc18e8cdfb7a84e1556
2022-09-23 11:01:33 -07:00
Bill Yi
4aae182edf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6820f433e9bc4442d0dce43f543563b3797ccfd4
2022-09-23 01:03:30 -07:00
Bill Yi
c46e0e3d6e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If66addd4f08126800df1980cf1adba4cd71788e1
2022-09-23 00:58:17 -07:00
Tom Hsu
7c813dced4
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Iacf9e213bb1f40859320957d7846803f4aeaa30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:32:19 +00:00
Tom Hsu
7e610abd3c
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Icd4cb165939b49e24ebbc83059c55914610e7eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:01:01 +00:00
Tom Hsu
8a9dc9ca90
Merge "[Settings] Update UI when bluetooth connection is down."
2022-09-23 06:39:35 +00:00
Gil Cukierman
1f750fcba6
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a am: 24ac97a0bf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: I50305e27b205160d85825143f614cd52b1bab2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:23:54 +00:00
Gil Cukierman
24ac97a0bf
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: Ib46bd4f287a80582afb67f7ef052a3ff25862b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 14:30:53 +00:00