PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,289 Commits 1 Branch 0 Tags
67c4be1e52dab91de1e45eb807fa1672307c0cd7
Commit Graph

84289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Milton Wu
d5771108b9 [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 
Prevent ChooseLockPassword and ChooseLockPatten being projected to
remote views, add FLAG_SECURE for these screens.

Bug: 179725730
Test: Check these 2 screens not projected to chromecast
Test: robo test for SetupChooseLockPatternTest ChooseLockPatternTest
      SetupChooseLockPasswordTest ChooseLockPasswordTest
Change-Id: I7449a24427c966c1aa4280a7b7e7e70b60997cca
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
(cherry picked from commit 98239c0da6)
 2022-09-15 06:59:11 +00:00
Milton Wu
3f02770332 [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403

Bug: 179725730
Change-Id: If1f5f223ce35e9eb7d038523dd663c8849426070
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
 2022-09-15 06:57:50 +00:00
Milton Wu
98e3bfdebb [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 
Prevent ChooseLockPassword and ChooseLockPatten being projected to
remote views, add FLAG_SECURE for these screens.

Bug: 179725730
Test: Check these 2 screens not projected to chromecast
Test: robo test for SetupChooseLockPatternTest ChooseLockPatternTest
      SetupChooseLockPasswordTest ChooseLockPasswordTest
Change-Id: I7449a24427c966c1aa4280a7b7e7e70b60997cca
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
(cherry picked from commit 98239c0da6)
 2022-09-15 06:57:35 +00:00
Oli Lan
11484d510a [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Ifa1eb07ec9264ea159064776d27c2fa2d2aeb1c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 21:24:56 +00:00
Oli Lan
52f5f2ee31 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Ic7660e922a883a8147447dad898d407c4f3d387e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 20:54:43 +00:00
Oli Lan
cbf1699cd7 Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058

Change-Id: Id74cd5fe28cec05a3fd87fc5434d28fad639e1b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 20:24:55 +00:00
Oli Lan
ff5b6611cf Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058

Change-Id: I8cc4562420648436abb478b686adb96c28d8163b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 19:39:55 +00:00
Oli Lan
05ea36ddc5 Prevent exfiltration of system files via avatar picker. am: f70e351d1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058

Change-Id: If9321bf1035c0492396adf4ce3b6579dfe31c66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 19:01:32 +00:00
Oli Lan
f70e351d1a Prevent exfiltration of system files via avatar picker. 
This adds mitigations to prevent system files being exfiltrated
via the settings content provider when a content URI is provided
as a chosen user image.

The mitigations are:

1) Copy the image to a new URI rather than the existing takePictureUri
prior to cropping.

2) Only allow a system handler to respond to the CROP intent.

This is a fixed version of ag/17003629, to address b/239513606.

Bug: 187702830
Test: build and check functionality
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
Change-Id: I98eea867f926c508456ec9bc654e24eeeffa0e54
 2022-08-26 19:46:02 +01:00
Oli Lan
141dc63796 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Ic969ff87d67009c3737c74f950966f19772f3269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:57:47 +00:00
Oli Lan
48046cf4ae [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I8dbc2b22a606856e839bcdbdc368c139df7d0b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:39:22 +00:00
Oli Lan
e2815b7e11 Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016

Change-Id: I017c55ae2e7770bd52f1daca54e2aed7be05cb5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:21:18 +00:00
Oli Lan
03b1a52977 Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016

Change-Id: I5a78c2328f8c68fb5bf15799a69479a82b8e7af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:03:51 +00:00
Oli Lan
05031cc574 Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016

Change-Id: Icfcf27040f9402b736306cf19178feee9f2a774b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 14:46:20 +00:00
Oli Lan
b9bafa0d3d Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev 2022-08-22 14:27:57 +00:00
Yuri Lin
d1c0e2151c [automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b28 -s ours am: 25aa1f617d -s ours am: 32e60479ca -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69 is already in history

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

Change-Id: I730cfb1b9593bcc4185d2effa5c474600e274bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 03:17:38 +00:00
Julia Reynolds
8e4337e37c [automerger skipped] Validate config activities with their rule owners am: b161a3b850 -s ours am: 812e171b1f -s ours am: fbcc4a9e52 -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69 is already in history

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

Change-Id: I1ab75fd0ccf2a320ba0b3a0325273694eec7b2d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 03:17:37 +00:00
Yuri Lin
32e60479ca [automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b28 -s ours am: 25aa1f617d -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69 is already in history

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

Change-Id: I168125b60128b83e614aa6b19bdddfc093b00978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 02:51:30 +00:00
Julia Reynolds
fbcc4a9e52 [automerger skipped] Validate config activities with their rule owners am: b161a3b850 -s ours am: 812e171b1f -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69 is already in history

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

Change-Id: I11ec899513899e3dd48a434762745451077ab372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 02:51:28 +00:00
Yuri Lin
25aa1f617d [automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b28 -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69 is already in history

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

Change-Id: I336ef4ab58d8c2cf31e857c49fd6ed88375796f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 02:26:09 +00:00
Julia Reynolds
812e171b1f [automerger skipped] Validate config activities with their rule owners am: b161a3b850 -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69 is already in history

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

Change-Id: I7b2266a5461935660c1eb59965d5b3ddfd5b54af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 02:26:05 +00:00
Yuri Lin
316cd96b28 Merge "Validate config activities with their rule owners" into rvc-dev 2022-08-11 01:32:32 +00:00
Julia Reynolds
7cb32cee36 [automerger skipped] Validate config activities with their rule owners am: 65b18b5e69 am: cc3edfd2c7 -s ours am: 8fada38f9e -s ours am: 8355374ddb -s ours am: 8badd7a6a4 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: I00ddbb23e1ba526fb53716fa3a31cb40fd22bab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 00:33:43 +00:00
Julia Reynolds
8badd7a6a4 [automerger skipped] Validate config activities with their rule owners am: 65b18b5e69 am: cc3edfd2c7 -s ours am: 8fada38f9e -s ours am: 8355374ddb -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: Ic38c5cbf072f80ce3fe323dde9c960e36659f847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:34:12 +00:00
Julia Reynolds
8355374ddb [automerger skipped] Validate config activities with their rule owners am: 65b18b5e69 am: cc3edfd2c7 -s ours am: 8fada38f9e -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: Ief88df7619d8fa00cdf9a9c7a64bdb422bdeab47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:01:01 +00:00
Julia Reynolds
8fada38f9e [automerger skipped] Validate config activities with their rule owners am: 65b18b5e69 am: cc3edfd2c7 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: Id6c1135838a71faecce17ba959a2dcccb0a8cbac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 22:20:44 +00:00
Julia Reynolds
cc3edfd2c7 Validate config activities with their rule owners am: 65b18b5e69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215

Change-Id: I844f7e5eeefced63bca9d9baf7b41d1f9b7ac277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:26:47 +00:00
Julia Reynolds
541f64ddfb [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

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

Change-Id: I8c9a0036519c37474da516184f0b1a8503c389bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:26:13 +00:00
Julia Reynolds
42e9a0cf0d [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

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

Change-Id: Ida93487ec0bd4a6bf25b93a1dd990f9d10f23fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 20:53:46 +00:00
Julia Reynolds
59ca26589e Validate config activities with their rule owners 
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
 2022-08-10 14:20:54 +00:00
Julia Reynolds
b161a3b850 Validate config activities with their rule owners 
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
 2022-08-10 14:20:22 +00:00
Julia Reynolds
65b18b5e69 Validate config activities with their rule owners 
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
 2022-08-10 14:19:14 +00:00
Oli Lan
c0742e745d Revert "Prevent exfiltration of system files via user image settings." 
This reverts commit 8950a90024.

Reason for revert: regression if multiple crop system crop handlers are present

Change-Id: Ib83dbb2f1109d26b7e85192379291bffef187e77
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
 2022-07-28 12:14:14 +00:00
Raphael Kim
8da96d69dd Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I5ba1ef5a3a708c14b9fb739753e83d923b98b1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 08:15:08 +00:00
Raphael Kim
6d5ea9e89a Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: Ie914a7dc51267245d8f7f919b1ed68040032fe63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 08:00:18 +00:00
Raphael Kim
d6353487cf Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I3825280fafc93e56ef239bf70d72b0bb56544f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-05 02:50:25 +00:00
Raphael Kim
84bafc9fda Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I13426af81ec5970befc29118f883a08d28c8a986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-05 02:32:26 +00:00
Raphael Kim
839ce544aa Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: Ic145c489bd89fbc822ee48bfc14193c62321d355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-05 02:14:41 +00:00
Raphael Kim
94683c61b1 Merge "Extract app label from component name in notification access confirmation UI" into qt-dev 2022-06-05 01:54:28 +00:00
Arc Wang
1732408586 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0 am: cb82328fac -s ours am: 4b96cb9339 -s ours am: 12f11b0683 -s ours am: ab3adbd4dd -s ours 
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362 is already in history

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

Change-Id: I44ab9fffbeada73003e5876eeb83f2cc07c7928e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:51:32 +00:00
Tsung-Mao Fang
2abeb254ea [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177 am: 99a7a61ba9 -s ours am: 2224883488 -s ours am: 2a665430e2 -s ours am: 2e3f8a30a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d7f8e78b6d9febcd06c7d84cc5c560b442ae294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:51:31 +00:00
Arc Wang
7c863fb69d [automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304 am: 58880a0bef -s ours am: 1e688667ba -s ours am: 1da60c2f31 -s ours am: 4129c273cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9bd953a9c613770fc12c121fdc155ee8b1aecaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:51:30 +00:00
Arc Wang
ab3adbd4dd [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0 am: cb82328fac -s ours am: 4b96cb9339 -s ours am: 12f11b0683 -s ours 
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362 is already in history

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

Change-Id: I6a43ef0a5d3be0ccea94ff04b6ef83bca00981b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:35:34 +00:00
Tsung-Mao Fang
2e3f8a30a1 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177 am: 99a7a61ba9 -s ours am: 2224883488 -s ours am: 2a665430e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied5f7df1a6f1e1f53a07dadcd828d8042a677c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:35:32 +00:00
Arc Wang
4129c273cc [automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304 am: 58880a0bef -s ours am: 1e688667ba -s ours am: 1da60c2f31 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia6a7f76c885e08cbf388bbd912b08f481ae23575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:35:29 +00:00
Arc Wang
12f11b0683 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0 am: cb82328fac -s ours am: 4b96cb9339 -s ours 
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362 is already in history

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

Change-Id: I5641668bddf5f94f95c0cfa59c7e5c2761bc8c53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:10:35 +00:00
Tsung-Mao Fang
2a665430e2 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177 am: 99a7a61ba9 -s ours am: 2224883488 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1399368e6286da4d3406faa019b4b6c86f4011f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:10:34 +00:00
Arc Wang
1da60c2f31 [automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304 am: 58880a0bef -s ours am: 1e688667ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id84dbd145b911c2d4df39d54c8c660043125b3f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 01:10:32 +00:00
Arc Wang
4b96cb9339 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0 am: cb82328fac -s ours 
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362 is already in history

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

Change-Id: Ia651809cfc726bcf9317b8b085e323b453489195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:44:35 +00:00
Tsung-Mao Fang
2224883488 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177 am: 99a7a61ba9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7f8fbefcef3c152fd924f5dd3305a75b47ce4cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:44:32 +00:00