PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,409 Commits 1 Branch 0 Tags
169e366ac3b3f72a7bfeb8ffd0a4fd5bcc9dcb69
Commit Graph

86409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
169e366ac3 [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062 -s ours am: 1ca7d315db -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 181c7e32f5 is already in history

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

Change-Id: If4f11c3200eaac9bc82dcf70f72268bd00f862d2
 2022-01-13 05:40:48 +00:00
Edgar Wang
781a615a41 Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579589

Change-Id: Ice31d95883bab76241015851444c3feb6bfa4b3c
 2022-01-13 05:40:41 +00:00
Edgar Wang
1ca7d315db [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062 -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 181c7e32f5 is already in history

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

Change-Id: Ibd39dbbcfca577d349e68a971c6fe559323956b3
 2022-01-13 05:40:19 +00:00
Edgar Wang
2df76f6062 Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev 2022-01-13 05:27:40 +00:00
Edgar Wang
36a989cdff Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev 2022-01-13 05:27:31 +00:00
Alex Johnston
3fd5e0f7f8 Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d am: d8124d47f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092

Change-Id: Ia028b11274420bec314c22f967f0d7cbe0e88570
 2022-01-11 21:33:10 +00:00
Alex Johnston
d8124d47f0 Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092

Change-Id: Ifbce4430f251b7b152538520f318e62900ea64b0
 2022-01-11 21:09:59 +00:00
Alex Johnston
ff07f8c34d Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev 2022-01-11 20:47:35 +00:00
Treehugger Robot
5ea82e5955 Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9 am: 039cdfd764 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134

Change-Id: I603a7c75d79b81f2b5e5809ed4292a5cba77a169
 2022-01-11 09:46:19 +00:00
Treehugger Robot
039cdfd764 Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134

Change-Id: I763f17465055f64f42093fac721e06ac2c81b286
 2022-01-11 09:26:59 +00:00
Treehugger Robot
0ccb8750b9 Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" 2022-01-11 09:06:50 +00:00
Junyu Lai
123f2e1581 [MS50] Remove NetworkTemplate#buildTemplate* usages 
This is a no-op refactoring.
These functions are deprecated and replaced by
NetworkTemplate#Builder, use public API instead.

Test: make RunSettingsLibRoboTests
Bug: 204830222
Change-Id: Idc2a09d8e3789ca2c7a97691cfad4b2e2b417f0d
 2022-01-11 02:53:03 +00:00
Treehugger Robot
c002768550 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 48c90fde8a -s ours am: d7b3c851b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib8828007c502460cab8675859efd53c79b358b61
 2022-01-11 01:36:15 +00:00
Treehugger Robot
56786c8317 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe140a6410 -s ours am: 8b4a0a04f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I73e4abb51e6dfb3725a0b19a2c39d76ad18d7d4d
 2022-01-11 01:32:53 +00:00
Treehugger Robot
d7b3c851b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 48c90fde8a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9a27700f722dc98f1ba8f9ff8f21ce7a2dbc0bd
 2022-01-11 01:18:26 +00:00
Treehugger Robot
8b4a0a04f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe140a6410 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6ce83076908961edfe95a2f388d87a06a0efdf2
 2022-01-11 01:15:44 +00:00
TreeHugger Robot
eb3e22d6f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e1e9adc14 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c6b3ef2d40215c682ba5ff59b758e9a091ac75a
 2022-01-11 01:03:43 +00:00
Bill Yi
7973db12a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9a027938e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac3fa529e4c286e699f140a779a56c3500c5391d
 2022-01-11 01:02:26 +00:00
Treehugger Robot
48c90fde8a Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-01-11 00:46:54 +00:00
Treehugger Robot
fe140a6410 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-01-11 00:46:30 +00:00
TreeHugger Robot
8e1e9adc14 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-01-11 00:41:52 +00:00
Bill Yi
0b57480c1a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6f04568a54e4b9ed91a16579f210fd320e317e5e
 2022-01-10 17:06:49 +00:00
Bill Yi
87d6f1f523 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I52253a63ba60867e86c9f85474062a03155bf0aa
 2022-01-10 17:03:04 +00:00
Bill Yi
e9a027938e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id3b3a757c9db72f3349a135e3b0e28ce34a35d16
 2022-01-10 05:45:14 +00:00
Bill Yi
6bc95e2783 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibeeefa1a48fbbebd0779d942f354eb1389130f51
 2022-01-10 05:41:40 +00:00
TreeHugger Robot
f48a240945 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours am: ad7ea804d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3172d86558003edbeafd7dc8480ae7cb4cafd9fd
 2022-01-09 05:36:59 +00:00
Bill Yi
5950ef489f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours am: dcd2b90022 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4733b05be99789d6564e3d1e93fcdac87dfa75c
 2022-01-09 05:36:53 +00:00
TreeHugger Robot
f2c222c977 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cc94febb28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I745c361ee221f9a9dbfe2275de5b095fda0cdfb0
 2022-01-09 05:35:49 +00:00
TreeHugger Robot
ad7ea804d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf86012a9197656e463869fa55785efadf1230c8
 2022-01-09 05:34:35 +00:00
Bill Yi
3710710bc5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f69d80aa34 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd3f900e12d87f0da38157f8ba2a130c9e058ae5
 2022-01-09 05:34:35 +00:00
Bill Yi
dcd2b90022 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07cdae04675495c5ed06cd0effdf2381939e54f2
 2022-01-09 05:34:28 +00:00
TreeHugger Robot
fad8ac95a4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-09 05:14:26 +00:00
TreeHugger Robot
cc94febb28 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-09 05:14:18 +00:00
Bill Yi
6930ac9588 [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3 -s ours am: 5ef6e53bf5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a9ec3301f4d4649584a57abc8d3776ae2e78311
 2022-01-07 18:16:20 +00:00
Bill Yi
5ef6e53bf5 [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08d291860f76cb1993aae826cb6bd85b4430e52e
 2022-01-07 17:48:51 +00:00
Bill Yi
75205dc6b3 Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" 2022-01-07 17:29:12 +00:00
Bill Yi
f69d80aa34 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iec8d44a0966c47b347de5290f9a3bc5f5c54dc6c
 2022-01-07 10:29:08 +00:00
Bill Yi
9fed0efc79 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I089bd7964eff40566f6e0e5f29419ffffd0e8525
 2022-01-07 10:25:35 +00:00
Bill Yi
6ad216fce4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0a648477cbd18dc003cae1dfa61a3387d8f76536
 2022-01-07 10:16:21 +00:00
Bill Yi
ac0bd999f1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If79c3e0fd0ebe9847befbf0f32184782cbc5f7e2
 2022-01-07 10:14:50 +00:00
Edgar Wang
181c7e32f5 Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment 
In onReceive of AppRestrictionsFragment.java, there is a possible way to
start a phone call without permissions due to a confused deputy.
This could lead to local escalation of privilege with no additional
execution privileges needed.

We should not allow the restrictionsIntent to startActivity simply
because it resolves to multiple activities.
Instead, we should call resolveActivity and check the result's package
name is same as current package name, then it is safe to startActivity.

Bug: 200688991
Test: manual verify
Change-Id: Iaa2d3a9497c3266babe0789961befc9776a4db7a
Merged-In: Iaa2d3a9497c3266babe0789961befc9776a4db7a
(cherry picked from commit 359512cd95)
 2022-01-07 04:25:09 +00:00
Edgar Wang
9926187972 Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment 
In onReceive of AppRestrictionsFragment.java, there is a possible way to
start a phone call without permissions due to a confused deputy.
This could lead to local escalation of privilege with no additional
execution privileges needed.

We should not allow the restrictionsIntent to startActivity simply
because it resolves to multiple activities.
Instead, we should call resolveActivity and check the result's package
name is same as current package name, then it is safe to startActivity.

Bug: 200688991
Test: manual verify
Change-Id: Iaa2d3a9497c3266babe0789961befc9776a4db7a
Merged-In: Iaa2d3a9497c3266babe0789961befc9776a4db7a
(cherry picked from commit 359512cd95)
 2022-01-07 04:24:53 +00:00
Bill Yi
39df254c94 Merge sc-qpr1 to aosp-master - DO NOT MERGE 
Merged-In: Id5612dfa82e11037cd95b0ef0f5a507d9c86dd48
Merged-In: I4f51c80cf4e32c384afad849c04c7c6afa065767
Change-Id: Ie466180309fcfe540492967e8bf3587b34928ded
 2022-01-06 18:39:02 -08:00
Bill Yi
9400843a91 [automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: ea1249b895 -s ours 
am skip reason: Merged-In I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4 with SHA-1 3387491083 is already in history

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

Change-Id: I4f51c80cf4e32c384afad849c04c7c6afa065767
 2022-01-07 02:01:47 +00:00
Bill Yi
ea1249b895 Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE 
Merged-In: I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4
Change-Id: Id5612dfa82e11037cd95b0ef0f5a507d9c86dd48
 2022-01-05 21:10:49 -08:00
Alex Johnston
db9333baac Add non system overlay flag to RequestManageCredentials 
Bug: 205150380
Test: Manual testing with Settings and TestDPC
Change-Id: I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0
Merged-In: I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0
 2022-01-05 20:19:47 +00:00
Chen Xu
3387491083 Merge "eSIM deprecated API test Refactoring" am: a4f936408c am: 688f9d61cd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1936017

Change-Id: I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4
 2022-01-04 20:02:29 +00:00
Chen Xu
44e579e3ea Merge "[MEP] eSIM deprecated API Refactoring" am: c479598895 am: cb851c79ae 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1934924

Change-Id: I580a094ed849679e0a7a96cd6c6558abe758a1ea
 2022-01-04 20:02:25 +00:00
Chen Xu
688f9d61cd Merge "eSIM deprecated API test Refactoring" am: a4f936408c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1936017

Change-Id: Iab671e2e10141401921aa0a27a24a4f222570fa0
 2022-01-04 19:18:08 +00:00
Chen Xu
cb851c79ae Merge "[MEP] eSIM deprecated API Refactoring" am: c479598895 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1934924

Change-Id: I1f2e66287f1cdad92515b3d248cacd56991fa38b
 2022-01-04 19:18:06 +00:00