Jack Yu
0e57ff90cd
Only primary user is allowed to control secure nfc
...
Bug: 238298970
Test: manual
Merged-In: I945490ef1e62af479a732c9a260ed94bdd8bc313
Change-Id: I945490ef1e62af479a732c9a260ed94bdd8bc313
2023-01-31 07:41:49 +00:00
Yanting Yang
a617639496
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8
-s ours am: 6326f5e65a
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871685
Change-Id: I54e4d0d1c79014920ddffe4a945423b624d10104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 04:30:33 +00:00
Yanting Yang
6326f5e65a
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871685
Change-Id: I390e1a3a8d8c683c604724571459ba7ebeccaf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 03:56:12 +00:00
Yanting Yang
3594b1e412
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 16500a7ada
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871703
Change-Id: I1b23667c48d00bb5e33cd2d3f96ee6ba3d0ee438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 03:23:36 +00:00
Yanting Yang
86914bedc8
Add DISALLOW_APPS_CONTROL check into uninstall app for all users
...
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.
To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.
Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 18:59:18 +00:00
Yanting Yang
1a43a98334
Add DISALLOW_APPS_CONTROL check into uninstall app for all users
...
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.
To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.
Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 18:58:32 +00:00
Yanting Yang
16500a7ada
Add DISALLOW_APPS_CONTROL check into uninstall app for all users
...
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.
To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.
Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 18:56:58 +00:00
Tsung-Mao Fang
ac092ac06f
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8
-s ours am: 4332b3266e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641138
Change-Id: Ie83ac1cc02b260d9468438076e8ca8ff11e72a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:17:51 +00:00
Tsung-Mao Fang
c923d29c08
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641137
Change-Id: Ic31163255a4a53af7b3473067afbd6e21ba11147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:17:33 +00:00
Tsung-Mao Fang
4332b3266e
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 b34ff2f272
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641138
Change-Id: Ia867eecc252f5bc5e95e2fd49e2802e9f1d413dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:17:27 +00:00
Tsung-Mao Fang
ff5bfb40c8
[DO NOT MERGE] FRP bypass defense in the settings app
...
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.
Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.
Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-12-07 03:09:30 +00:00
Tsung-Mao Fang
b34ff2f272
[DO NOT MERGE] FRP bypass defense in the settings app
...
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.
Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.
Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-12-07 03:08:58 +00:00
Tsung-Mao Fang
71f2d83688
FRP bypass defense in the settings app
...
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.
Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.
Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-12-06 11:45:08 +00:00
changbetty
f79bce9e6a
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58
am: 8f412f14d2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419569
Change-Id: Icef924bc46f0d32e40ec5a8e603a6b3ce6f6bd84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 03:41:20 +00:00
changbetty
990c3d2a45
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419568
Change-Id: I09f8da9647990cadb9b28f741f2f30e2d70ad783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 03:41:08 +00:00
changbetty
8f412f14d2
RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419569
Change-Id: Ibb68644054e0b89f512a9540958a588a92194443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 03:39:36 +00:00
changbetty
c55c060361
RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline
...
Bug: 244423101
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDashboardFragmentTest
Test: manual test by test apk
Change-Id: I13562d227e06627fac33239a9d21fd405a18d012
2022-11-09 06:39:29 +00:00
changbetty
fecf464fb4
RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline
...
Bug: 244423101
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDashboardFragmentTest
Test: manual test by test apk
Change-Id: I13562d227e06627fac33239a9d21fd405a18d012
2022-11-09 06:37:57 +00:00
changbetty
3cc8db3c58
RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline
...
Bug: 244423101
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDashboardFragmentTest
Test: manual test by test apk
Change-Id: I13562d227e06627fac33239a9d21fd405a18d012
2022-11-09 06:37:27 +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
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
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
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
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
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
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
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