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

90657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
89fee8de3b [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d -s ours am: edcb9c9b0e -s ours am: 761a605352 -s ours am: 56eb657908 -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972 is already in history

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

Change-Id: Iffc11a0beaf796cec3547a8d7158a543e80a6659
 2022-01-13 05:56:33 +00:00
Edgar Wang
3e6893d502 [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062 -s ours am: 1ca7d315db -s ours am: 169e366ac3 -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: I128ffd4275ce39f93e03ccb2f742f465c7e007ff
 2022-01-13 05:56:27 +00:00
Edgar Wang
d545a97f9b [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff am: 781a615a41 -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa4d is already in history

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

Change-Id: I9d14271bcb2cd1bc971aed2f108f09df98586fd7
 2022-01-13 05:56:18 +00:00
Edgar Wang
0a298b167d [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16 -s ours am: 463624d522 -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa4d is already in history

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

Change-Id: Ie5a778da092bf3055ec6ccc8641b684d7f54ad46
 2022-01-13 05:45:13 +00:00
Edgar Wang
a821946744 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d -s ours am: edcb9c9b0e -s ours am: 761a605352 -s ours am: 8a964679e7 -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972 is already in history

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

Change-Id: Icecec266938a65c20857a488aa14d7cb456672f4
 2022-01-13 05:45:03 +00:00
Edgar Wang
c1fb4cc177 [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062 -s ours am: 1ca7d315db -s ours am: 02a8368286 -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: I8a2468cd50c806ce585fd4f790410125b28b50e7
 2022-01-13 05:44:58 +00:00
Edgar Wang
409b9b13ba [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff -s ours am: 2e19b6a0da -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 4fb753d22e is already in history

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

Change-Id: I3ad9f5982c86682587eaa61784181ae41178a188
 2022-01-13 05:44:52 +00:00
Edgar Wang
56eb657908 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d -s ours am: edcb9c9b0e -s ours am: 761a605352 -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972 is already in history

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

Change-Id: I43c83b3770e67629d3690730ffd82fece99b7e41
 2022-01-13 05:40:55 +00:00
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
8a964679e7 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d -s ours am: edcb9c9b0e -s ours am: 761a605352 -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972 is already in history

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

Change-Id: I059f14dc9e47ad59d811e68250fa1b07ea9c8bac
 2022-01-13 05:40:31 +00:00
Edgar Wang
761a605352 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d -s ours am: edcb9c9b0e -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972 is already in history

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

Change-Id: I968ec3a812591dac1ec67d5b614d7739a1607e64
 2022-01-13 05:40:26 +00:00
Edgar Wang
02a8368286 [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: Ida96339b0445175625089d5833e6ff116949284f
 2022-01-13 05:40:25 +00:00
Edgar Wang
2e19b6a0da [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 4fb753d22e is already in history

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

Change-Id: I6ae5cb0b33e7d03ee6c0b259a94bb4541a1f843d
 2022-01-13 05:40:19 +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
e95b2c6c53 Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579586

Change-Id: I3311a1514d0edeca1011642e2a368b7aa6eeb170
 2022-01-13 05:40:08 +00:00
Edgar Wang
60af57af90 Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-v2-dev am: 362000122e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579590

Change-Id: I468a47507f90ae3434752f762993981eb5076eb6
 2022-01-13 05:39:54 +00:00
Edgar Wang
463624d522 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16 -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa4d is already in history

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

Change-Id: I5e42a5a8939af57523b1691c5f525df746e94ac1
 2022-01-13 05:39:53 +00:00
Edgar Wang
edcb9c9b0e [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972 is already in history

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

Change-Id: I6bf44b9e56ac21a73b7ea20b756a4d93a438e485
 2022-01-13 05:39:03 +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
Edgar Wang
362000122e Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-v2-dev 2022-01-13 05:27:16 +00:00
Alex Johnston
d567862732 [automerger skipped] Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d am: d8124d47f0 -s ours am: ca8073159b -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: I76f9f974a5a95e34dba21612044577a4d0533d26
 2022-01-11 21:51:36 +00:00
Alex Johnston
d60558861a [automerger skipped] Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d am: d8124d47f0 am: 3fd5e0f7f8 -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: I1db904751a2cfa6671c587a816089d825871506e
 2022-01-11 21:50:53 +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
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