Commit Graph

104587 Commits

Author SHA1 Message Date
Adam Bookatz
8311f68065 Fix Settings getProfileIdsWithDisabled usage
In two places, Settings uses getProfileIdsWithDisabled intending to
restrict itself to *managed* profiles, but actually allows for any type
of profile.

Since the declared intent is to only deal with managed profiles, we
update the code to only consider managed profiles.

On devices that only have managed profiles (currently almost all
devices), this cl is a no-op.

Bug: 230495929
Bug: 230534572
Bug: 170249807
Test: com.android.settings.UtilsTest
Test: make RunSettingsRoboTests -j
Change-Id: Id04d45839ef61080b00ca2f91525718cb3a85120
2022-04-27 18:34:07 -07:00
TreeHugger Robot
de3a095e2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -s ours am: 5734853d61 -s ours am: 7562644667 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ce8b87654cd817a6578e67a61d876be80ebfc93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 20:04:31 +00:00
TreeHugger Robot
7562644667 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -s ours am: 5734853d61 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34f38474a562ff2a619da70bf00ecf387043eefc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 19:49:47 +00:00
TreeHugger Robot
8bf9454c95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -s ours am: 2902d67c16 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc97df20000468212c749a05b96d0b2ee84c2b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 19:49:25 +00:00
TreeHugger Robot
5734853d61 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61575bf7aeb0e1bf99e275a3ece78d3f3db325d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 19:26:13 +00:00
TreeHugger Robot
2902d67c16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5cc92c254bb91040742ce55df82ce3088e00ce30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 19:25:02 +00:00
TreeHugger Robot
467b85d088 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4435f6f1918ce336ee104c933f7d040a165f2153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:51:14 +00:00
TreeHugger Robot
0092201223 Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f18d am: 5bf683e8f5 am: 2972c8c462
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765

Change-Id: Ie28bdd8d56c9c67b41bb1a40747456da8a9fc5ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:46:59 +00:00
Bill Yi
a54851cb19 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae am: fb20f3183b -s ours am: 2631a9a4f1 -s ours am: fc6437b4fb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I44e8a035ff71d7aea69cc38b2165d7e819de2607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:46:58 +00:00
TreeHugger Robot
425f72df0e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e6a5247285 -s ours am: 4c32ec0371 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d56cd0b5a82c6f3eee927a69537eb8e5d660d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:46:49 +00:00
Bill Yi
3d077e5671 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f48173940 -s ours am: 8fda064295 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98561c5475b8ecbd3834107081264f4471498c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:46:47 +00:00
TreeHugger Robot
88527377b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8e461aef7b -s ours am: 74a36a7659 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7ca5094cbe2435bb2e837939e451dcf4b039f9aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:46:30 +00:00
Bill Yi
cba3a3003c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9be756fd4 -s ours am: a719bfa0b3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I275b1f9f67500410bf3f52b5eb32a5008463eda9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:46:29 +00:00
Bill Yi
6d3ad361d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65 -s ours am: 6c46c20518 -s ours am: fa0b661076 -s ours am: c71203f16d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie2e87185cc108d4cc457d3090a38110e37c2a3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:46:21 +00:00
Peiyong Lin
aab9e76cf6 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 am: fceaaa80a0 am: fa6ecc7857
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

Change-Id: Iee5900e38feb0c33658709370c7732a067b7b8ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:45:51 +00:00
TreeHugger Robot
2972c8c462 Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f18d am: 5bf683e8f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765

Change-Id: Ib848e8a84d113f56002f3a9d810da8eb0f32f99f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:45:29 +00:00
Bill Yi
fc6437b4fb [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae am: fb20f3183b -s ours am: 2631a9a4f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I144dbdf1dda930056d54e64a69b3383166bd9a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:45:28 +00:00
TreeHugger Robot
4c32ec0371 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e6a5247285 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77e12637a86224404abbc0b7b51e4f616e77b234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:45:21 +00:00
Bill Yi
8fda064295 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f48173940 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5064b78c2ac8b2bfa8b05524d47324cf67673b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:45:20 +00:00
TreeHugger Robot
74a36a7659 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8e461aef7b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a28499c697435d9b2d85ad7c94032bff4e90697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:45:08 +00:00
Bill Yi
a719bfa0b3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9be756fd4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I892b308850183401f240d915e6dd41f509bff424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:57 +00:00
Bill Yi
c71203f16d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65 -s ours am: 6c46c20518 -s ours am: fa0b661076 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie1afc461ae8f3561b19c88807d093bb7911ff557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:51 +00:00
Peiyong Lin
fa6ecc7857 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 am: fceaaa80a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

Change-Id: Id490733f3fed747546e80d96031bc71508f32748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:47 +00:00
TreeHugger Robot
d77e4a9656 Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f18d am: 61c166f2f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765

Change-Id: Ifdfea8109bde0cf137f0fdbfa1aac200e438485f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:36 +00:00
Bill Yi
8b3b3c9ae4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae am: fb20f3183b -s ours am: e46d450ee6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I01ca3f5f120a61bcea210e0c0da86d936960132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:35 +00:00
Bill Yi
10f7d518e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65 -s ours am: 6c46c20518 -s ours am: b5d0a278e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib6041642f5d398c3057a7520e3bfd275ec29c547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:27 +00:00
TreeHugger Robot
5bf683e8f5 Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f18d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765

Change-Id: I19124fd659f0faa1e212e1dd35aa2133552880f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:24 +00:00
Bill Yi
2631a9a4f1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae am: fb20f3183b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I07f502dac11a5c652c4a248dd90c127949678afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:23 +00:00
Peiyong Lin
9709e05a66 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 am: f71c92bbb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

Change-Id: Ib6e82ca9a61dd489737f7044bd09c37ddc436861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:44:20 +00:00
TreeHugger Robot
61c166f2f4 Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f18d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765

Change-Id: Ia874c152d0c5ed0757242064c5c6b75c3b845f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:43:56 +00:00
Bill Yi
e46d450ee6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae am: fb20f3183b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I807cf19714d8b4657a48d4102730fc7b210ebf8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:43:55 +00:00
Yuri Lin
5efac57e33 Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5 am: d21ef57315 am: d6dc2708c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955

Change-Id: I4c4416803023ca2090e6eff9e0f069503fb99a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:43:40 +00:00
TreeHugger Robot
aa1f86f18d Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae
  Import translations. DO NOT MERGE ANYWHERE
2022-04-18 18:14:25 +00:00
TreeHugger Robot
5e411c38cb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-18 18:14:25 +00:00
TreeHugger Robot
e6a5247285 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-18 18:11:44 +00:00
TreeHugger Robot
8e461aef7b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-18 18:11:41 +00:00
Bill Yi
b5d0a278e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65 -s ours am: 6c46c20518 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic83945030f5218878648f85f28941a80c1a30e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:02:06 +00:00
Bill Yi
fa0b661076 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65 -s ours am: 6c46c20518 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic7bc9652b1eb3b9a7ebe16cb21a1f548c280f815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:01:32 +00:00
Peiyong Lin
f71c92bbb6 Merge "Clean up extra app info." into tm-dev am: bd26c3c747
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

Change-Id: I8bca1560e57bf3a63fe75bcc84e2b875aaa894b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:00:25 +00:00
Peiyong Lin
fceaaa80a0 Merge "Clean up extra app info." into tm-dev am: bd26c3c747
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

Change-Id: I717aff5f945e5ddae382d0c09b7185f03be522e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:00:09 +00:00
Bill Yi
6c46c20518 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5fbaef29db47314d259051001fc284f01b627229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:00:04 +00:00
Yuri Lin
d6dc2708c7 Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5 am: d21ef57315
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955

Change-Id: I67ea5071f8d033af594467c0903f442916cc79e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 17:52:45 +00:00
Peiyong Lin
bd26c3c747 Merge "Clean up extra app info." into tm-dev 2022-04-18 17:37:41 +00:00
Yuri Lin
d21ef57315 Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955

Change-Id: I4e88828a7d398b014be9313bf59819a3edf9322f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 17:24:04 +00:00
Yuri Lin
52b7e8ced6 Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5 am: 075dd07035
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955

Change-Id: I76b9cc331e0af9d874d241c6d2c1c97b7997a04e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 17:23:40 +00:00
Yuri Lin
075dd07035 Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955

Change-Id: Ib1f6d16868ba3f566993c339cf2fa8899cb512c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 17:23:06 +00:00
Yuri Lin
a73c850aa5 Merge "Special handling for intent coming from "welcome" notification." into tm-dev 2022-04-18 17:09:02 +00:00
Bill Yi
c9be756fd4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I75dfdb75599cc9562f58c1ee8e38c5f528865e99
2022-04-18 10:53:47 +00:00
Bill Yi
1f48173940 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie1d8ab7bb37e96ef5c233a16a2b1f225810279d0
2022-04-18 10:41:37 +00:00
Bill Yi
fc86f72e65 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7d547343a1ce1a358b12ab082db4378d88b67c14
2022-04-18 10:36:04 +00:00