Android Build Coastguard Worker
464e7eb776
Snap for 8961426 from 662e5722b3
to tm-qpr1-release
...
Change-Id: Ibcaa452224f959730e50a514b0fc7773b305ea4c
2022-08-17 23:30:11 +00:00
Tsung-Mao Fang
662e5722b3
[automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99
-s ours am: 4e53971f19
-s ours
...
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561
Change-Id: I9075895f07ea2a3bf74ab70aab62439ab19244ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 18:49:20 +00:00
Tsung-Mao Fang
4e53971f19
[automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99
-s ours
...
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561
Change-Id: I22b02fef7d8f63615f203fa3634d47b2d369cc96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 18:11:47 +00:00
TreeHugger Robot
84935ceab8
[automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0
-s ours
...
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590400
Change-Id: Ie074b5d8865a251480f7e8d116542296e5253be4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 17:47:13 +00:00
Tsung-Mao Fang
fa5900b6ba
[automerger skipped] Wi-Fi panel doesn't need to check permission am: d2c372450c
-s ours
...
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590400
Change-Id: I2fe3c73254c35c778191cf8899fccf48dcab7a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 17:47:08 +00:00
TreeHugger Robot
75ee88eaa0
Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev
2022-08-17 17:16:52 +00:00
Robert Luo
63aca8e131
Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev
2022-08-17 04:28:08 +00:00
Jason Hsu
f21593c870
Merge "Add pair button in bluetooth details page for hearing aid device" into tm-qpr-dev
2022-08-17 02:43:47 +00:00
Tsung-Mao Fang
5e785a2d99
Wi-Fi panel doesn't need to check permission
...
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.
This implementation is ok for most apps without
sharing system uid. However, this may not work
if the package is set with sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package as our
calling package, then it could fail to pass
permission check since that package could be not
a correct calling package.
In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
Wi-Fi Panel problem since Wi-Fi panel runs
on settings process(with system uid).
Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998
Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
2022-08-17 02:43:03 +00:00
Android Build Coastguard Worker
a6e4eeeded
Snap for 8953730 from ea3f9f337e
to tm-qpr1-release
...
Change-Id: I1b48e39b05de92d6f97a724c573785b1deecdbd7
2022-08-16 23:30:47 +00:00
Chloris Kuo
4d4bf61c4c
Merge "Fix settings crash when enhanced notification shown in search results" into tm-qpr-dev
2022-08-16 20:05:46 +00:00
Chloris Kuo
359929732d
Fix settings crash when enhanced notification shown in search results
...
init NotificationBackend in constructor and set isSliceable to false in
search result since the NAS enabling logic is required and is in the
parent fragment ConfigureNotificationSettings.
Bug: 237251075
Test: test manually on device
Change-Id: I9082d6eda27784cf378a0d06304b5fc1e2ae6d7f
(cherry picked from commit 26ce9a98f0
)
2022-08-16 17:08:17 +00:00
Julia Reynolds
dbaa419226
Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev
2022-08-16 17:07:18 +00:00
TreeHugger Robot
ea3f9f337e
Merge "RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature" into tm-qpr-dev
2022-08-16 04:03:12 +00:00
Tsung-Mao Fang
d2c372450c
Wi-Fi panel doesn't need to check permission
...
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.
This implementation is ok for most apps without
sharing system uid. However, this may not work
if the package is set with sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package as our
calling package, then it could fail to pass
permission check since that package could be not
a correct calling package.
In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
Wi-Fi Panel problem since Wi-Fi panel runs
on settings process(with system uid).
Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998
Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
2022-08-16 03:59:56 +00:00
Julia Reynolds
2a61b3656b
Update Bridged app link when NLS access changes
...
Test: BridgedAppsLinkPreferenceControllerTest
Test: manual; turn an NLS on/off, verify correct disabled state for fields
Fixes: 240461761
Change-Id: Ib5a5365f7477c2a8d620ced2af96ace364b292e2
2022-08-15 17:50:49 +00:00
Android Build Coastguard Worker
304f5b40a1
Snap for 8946049 from ec740c30d5
to tm-qpr1-release
...
Change-Id: I2022dbf10675869e83c9cda6593b581603e4dc74
2022-08-15 00:50:37 +00:00
TreeHugger Robot
ec740c30d5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-08-14 20:53:24 +00:00
Android Build Coastguard Worker
617a140dc5
Snap for 8944446 from 1215a5dff3
to tm-qpr1-release
...
Change-Id: I9470bbcddf31c0524a970bd04bc7668a9d5ba842
2022-08-13 21:25:27 +00:00
TreeHugger Robot
1215a5dff3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours am: e91b230bac
-s ours am: cedd9510e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I8e2e6a80985483ea90a3ec2d1727dbc481b3d3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:58:16 +00:00
Bill Yi
6e1b3b15d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223
-s ours am: 9b8d62847e
-s ours am: 0e2272c6f6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: Ie58fb6523c3541c36417c1decb945010feb56a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:58:05 +00:00
Bill Yi
76812fbeb1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee
-s ours am: c64165dc4a
-s ours am: 89ae91f7cd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357
Change-Id: Ia07419031ac07860372dfac9a44244c027558b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:57:57 +00:00
TreeHugger Robot
cedd9510e1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours am: e91b230bac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I03bd64208ce12db81a9f8baf2aa7915bc452e4d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:33:19 +00:00
Bill Yi
0e2272c6f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223
-s ours am: 9b8d62847e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I2c3534ae74b3530ce4b795b90f2fe4abf07a23b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:33:09 +00:00
Bill Yi
89ae91f7cd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee
-s ours am: c64165dc4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357
Change-Id: I3d548bafd75b267eda401f03d688edae9f8c0565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:33:00 +00:00
TreeHugger Robot
e91b230bac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: I8d9fe810fae9f907eaaee43681b54b047c2cedf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:01:35 +00:00
Bill Yi
9b8d62847e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358
Change-Id: Iacfaa7a89d11000f8e5218661d404cad0e435795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:01:28 +00:00
Bill Yi
c64165dc4a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357
Change-Id: I08ee6f10b0daff666ef0100551f50405a59f3132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-13 04:01:17 +00:00
Android Build Coastguard Worker
005922ffb6
Snap for 8941678 from f92894768f
to tm-qpr1-release
...
Change-Id: Idca5abd38866d67476f491ef1e19ed30410cf08a
2022-08-13 01:30:28 +00:00
TreeHugger Robot
f92894768f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ba19ab70fa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: I98da540c0dc07551a1ecdf8c7bf7b87f16be53c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:10:30 +00:00
Bill Yi
6b09835d1e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e59b16b1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602321
Change-Id: Ib0c9054563ab03e9075de4b3c55bdd8fe02ddc71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 20:10:08 +00:00
TreeHugger Robot
ba19ab70fa
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-12 19:50:01 +00:00
Bill Yi
76182fe42d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a
-s ours am: 1d60978515
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: I499779bbd3cca72249b731b4a0f9572d27bfa3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:42:06 +00:00
Bill Yi
1d60978515
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317
Change-Id: Icd7bb1e1eb6caba9610276ed3660e919c2be94c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 19:06:24 +00:00
TreeHugger Robot
957768ce00
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-08-12 18:52:01 +00:00
Ats Jenk
3f000fa764
Merge "Developer tile for toggling desktop mode" into tm-qpr-dev
2022-08-12 16:22:44 +00:00
TreeHugger Robot
cfd4e87ac8
Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences" into tm-qpr-dev
2022-08-12 15:05:49 +00:00
Bill Yi
9d4bf7b223
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f852ef2312fc59d8aa1cb46ee7b04c33ec2b13f
2022-08-12 07:30:07 -07:00
Bill Yi
0d14a19eee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3e12999c8049c46ebdc24abce1b01aa5bd90b103
2022-08-12 07:26:23 -07:00
Yanting Yang
ea6a06c8e8
Check DISALLOW_APPS_CONTROL before performing reset app preferences
...
When DISALLOW_APPS_CONTROL restriction is enabled, users should not be
able to enable/disable apps, clear app caches and clear app data.
The function of reset app preferences will re-enable the disabled apps,
it can let users bypass DISALLOW_APPS_CONTROL to enable an app disabled
by IT admin to see sensitive information.
To fix this vulnerability, we add a check for DISALLOW_APPS_CONTROL
restriction before users reset app preferences. Once the restriction is
enabled, it will show dialog “Blocked by your IT admin” instead.
Bug: 238745070
Test: Verify change by turning on/off DISALLOW_APPS_CONTROL with TestDPC.
Change-Id: Iffee73cf4952b686a78b4c7aaa54747971337d03
(cherry picked from commit 4356c9c653
)
2022-08-12 12:25:48 +00:00
TreeHugger Robot
5ab0a976de
Merge "Fix import of anyLong in BatteryChartPreferenceControllerTest." into tm-qpr-dev
2022-08-12 10:00:55 +00:00
Zaiyue Xue
2e7957727f
Fix import of anyLong in BatteryChartPreferenceControllerTest.
...
This is to fix the merge conflicts within tm-qpr-dev,
tm-qpr-dev-plus-aosp and master.
Bug: 236101166
Test: manual
Change-Id: I2f4531ccc7c59b279d14bc5c0bd6c1fe51dd475d
Merged-In: I52547d10f0579fddb21091b641925910db17ef38
2022-08-12 13:57:53 +08:00
TreeHugger Robot
0077129094
Merge "Wi-Fi panel doesn't need to check permission" into tm-qpr-dev
2022-08-12 02:27:36 +00:00
Betty Chang
9c0904acde
Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev
2022-08-12 01:29:01 +00:00
TreeHugger Robot
2cd733dcdb
Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev
2022-08-12 01:19:01 +00:00
Bill Yi
6e59b16b1a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id9572b300cf64f784cdde6fd770f7cd9930ea467
2022-08-11 16:31:32 -07:00
Bill Yi
2337f90b7e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4577f4c82707cac007f20516c8605c6dec9fc613
2022-08-11 16:27:09 -07:00
Android Build Coastguard Worker
1e50f47ccd
Snap for 8937168 from bb2aebbf5e
to tm-qpr1-release
...
Change-Id: I18cb3390f7b97a5e62b518ddbf8bafeab4f030f8
2022-08-11 23:25:49 +00:00
Bill Yi
9257e5881a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib173df0df75a70cfe0e675ed9507bf28916e7094
2022-08-11 16:22:42 -07:00
Prabal Singh
aaa6f7ef31
Merge "Hide work policy info if safety center is enabled" into tm-qpr-dev
2022-08-11 22:05:11 +00:00