PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,738 Commits 1 Branch 0 Tags
c300a01bf49eb22a4a40fe9553380c0ed331197c
Commit Graph

90738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ca8073159b [automerger skipped] Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d am: d8124d47f0 -s ours 
am skip reason: Merged-In I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0 with SHA-1 04c66a0a3c is already in history

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

Change-Id: Idb19d10a976088c5a0d7bbbefe4f01a53264b0a4
 2022-01-11 21:33:08 +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
15c5e404bf Merge "Add non system overlay flag to RequestManageCredentials" into sc-v2-dev am: 3ab85fbd60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414974

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

Change-Id: I21f0e516ec82f875638eabcd700fdead02048d7c
 2022-01-11 10:03:53 +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
fdb97d1cda [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 48c90fde8a -s ours am: d7b3c851b5 -s ours am: c002768550 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: If5f83f54ea6cb8885eeab4da7ed529e68235ce1a
 2022-01-11 01:46:08 +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
2d3e0c8bb2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e1e9adc14 -s ours am: eb3e22d6f8 -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: I5d06593619eee1b6825e3c11e688cb13c7cc5507
 2022-01-11 01:20:05 +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
Bill Yi
e407f4e902 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9a027938e -s ours am: 7973db12a9 -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: I22fdc9eea1877cf46254b26a47feea6a937bc027
 2022-01-11 01:16:59 +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
Alex Johnston
6407b20ab3 Add caller check to com.android.credentials.RESET 
* Only the Settings app can reset credentials
  via com.android.credentials.RESET.
* com.android.credentials.INSTALL should still be
  callable by CertInstaller.

Manual testing steps:
* Install certificate via Settings
* Verify unable to reset certificates via test app
  provided in the bug (app-debug.apk)
* Verify able to reset certificates via Settings
* Verify com.android.credentials.INSTALL isn't changed

Bug: 200164168
Test: manual
Change-Id: I9dfde586616d004befbee529f2ae842d22795065
(cherry picked from commit 4c1272a921)
Merged-In: I9dfde586616d004befbee529f2ae842d22795065
 2022-01-10 17:45:00 +00:00
Alex Johnston
f8a1a563c7 Add caller check to com.android.credentials.RESET 
* Only the Settings app can reset credentials
  via com.android.credentials.RESET.
* com.android.credentials.INSTALL should still be
  callable by CertInstaller.

Manual testing steps:
* Install certificate via Settings
* Verify unable to reset certificates via test app
  provided in the bug (app-debug.apk)
* Verify able to reset certificates via Settings
* Verify com.android.credentials.INSTALL isn't changed

Bug: 200164168
Test: manual
Change-Id: I9dfde586616d004befbee529f2ae842d22795065
(cherry picked from commit 4c1272a921)
Merged-In: I9dfde586616d004befbee529f2ae842d22795065
 2022-01-10 17:39:47 +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
f61b4d1500 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours am: ad7ea804d8 -s ours am: f48a240945 -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: I9d412f5723d5b7a462f8d0796304b79049bf66b5
 2022-01-09 05:51:35 +00:00
Bill Yi
96b65ea4c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours am: dcd2b90022 -s ours am: 5950ef489f -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: I562acc3cc17334eeff5fe00e45bc72abf6250ae1
 2022-01-09 05:51:29 +00:00
TreeHugger Robot
73f4a6ef55 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cc94febb28 -s ours am: f2c222c977 -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: I400750354cbecd804ae6d442d081d0c517ed7667
 2022-01-09 05:51:01 +00:00
Bill Yi
6572de6e78 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f69d80aa34 -s ours am: 3710710bc5 -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: I126901224bd7f1dc3b98fb71b544dc76abdf36c3
 2022-01-09 05:50:18 +00:00
TreeHugger Robot
73c95c1ac3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours am: ad7ea804d8 -s ours am: 6437b8590b -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: I94760890a5fbd36af6a210251279160f4d14d0fb
 2022-01-09 05:48:21 +00:00
Bill Yi
9e22464ec0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours am: dcd2b90022 -s ours am: 9d02a7114f -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: I25859b60d5a3d6add12471b4be91fcecf1d5cae1
 2022-01-09 05:45: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
6437b8590b [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: I47fad93803ce4dc9461c8f1c763a182641cfa157
 2022-01-09 05:36:09 +00:00
TreeHugger Robot
661c9295b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cc94febb28 -s ours am: fbc1a45d59 -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: I7b97577a11da6b2381d86dced3e16e31e3e4d78c
 2022-01-09 05:35:52 +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
Bill Yi
9d02a7114f [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: I4a20b42fe8fd94ddb726ab7e7364f371db547370
 2022-01-09 05:35:49 +00:00
Bill Yi
422501a5a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f69d80aa34 -s ours am: edc751bbaa -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: I6e026a5b12c8c4dd389fb6e27263a30d56e9ea01
 2022-01-09 05:35:39 +00:00
TreeHugger Robot
fbc1a45d59 [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: Id72341e0cb3eb113002eb574ac48caa738a79c32
 2022-01-09 05:35:24 +00:00
TreeHugger Robot
8f3bd108d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9dd4542560 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1db59b3b259e08f46b4584bafe39458b2522e5a0
 2022-01-09 05:34:59 +00:00
Bill Yi
edc751bbaa [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: I0799eb79c1f6c4bae9bdf6ed1c639e9de03350d4
 2022-01-09 05:34:42 +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
0f91d91d56 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: da2e65e4ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8eb8acddb66b72c37413d62585b3a735287c4f21
 2022-01-09 05:34:13 +00:00