Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
489,040 Commits 3 Branches 0 Tags
ef729aad2056fa0dd596d808d1d923b4940727f7
Commit Graph

489040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Dementyev
ef729aad20 [automerger skipped] Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: fe16873a33 -s ours am: 2d91b0fcaa -s ours am: 9aaffcb759 -s ours am: 54c839515b -s ours 
am skip reason: Change-Id I1421c333b6cebb4f7cddcdd8766298f6872e933b with SHA-1 10d8a114bb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13031365

Change-Id: I77a92f64de96eed1a2769f77da233f581dab53b3
 2020-11-11 22:55:11 +00:00
Dmitry Dementyev
5ec7e0d4f6 Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev am: a064b69f18 am: f0263a9369 am: 4290008125 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029782

Change-Id: I79f2b63e85c8c91598bdac111c37da6c22a6af9f
 2020-11-11 22:54:59 +00:00
Dmitry Dementyev
54c839515b [automerger skipped] Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: fe16873a33 -s ours am: 2d91b0fcaa -s ours am: 9aaffcb759 -s ours 
am skip reason: Change-Id I1421c333b6cebb4f7cddcdd8766298f6872e933b with SHA-1 10d8a114bb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13031365

Change-Id: I549b3baca0db2b3b815de49941a324f6bd7b487c
 2020-11-11 22:02:10 +00:00
Dmitry Dementyev
4290008125 Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev am: a064b69f18 am: f0263a9369 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029782

Change-Id: If1903ef712d1d297cea648a6d78213127ddd3fd6
 2020-11-11 22:01:38 +00:00
Dmitry Dementyev
9aaffcb759 [automerger skipped] Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: fe16873a33 -s ours am: 2d91b0fcaa -s ours 
am skip reason: Change-Id I1421c333b6cebb4f7cddcdd8766298f6872e933b with SHA-1 10d8a114bb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13031365

Change-Id: I40b481bca48933b616c29aef4af5f1bd2cbd8ac4
 2020-11-11 21:46:53 +00:00
Dmitry Dementyev
2d91b0fcaa [automerger skipped] Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: fe16873a33 -s ours 
am skip reason: Change-Id I1421c333b6cebb4f7cddcdd8766298f6872e933b with SHA-1 10d8a114bb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13031365

Change-Id: I58cd06c76264d8919a6dfd22f14d21b3a700d275
 2020-11-11 21:41:59 +00:00
Dmitry Dementyev
f0263a9369 Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev am: a064b69f18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029782

Change-Id: Ibf0233c8e736166a6357d622a5f5763cca64c07a
 2020-11-11 21:41:34 +00:00
Dmitry Dementyev
fe16873a33 Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev 2020-11-11 21:11:06 +00:00
Dmitry Dementyev
a064b69f18 Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev 2020-11-11 21:10:46 +00:00
Dmitry Dementyev
e1555adbb1 [automerger skipped] Protect GrantCredentialsPermissionActivity against overlay. am: deddb784d0 am: 21e36702cd am: f312c9e864 am: 6717abba6e -s ours am: 953586c0e7 -s ours am: 558392e1ed -s ours am: 4beba29d08 -s ours 
am skip reason: Change-Id I15dd22791fcc61ef02b06ad51d9e4409d11c0181 with SHA-1 f45dcfe1f5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13021294

Change-Id: Ibdd39864620f264bfc9c40cafa758f376c458915
 2020-11-11 16:23:06 +00:00
Dmitry Dementyev
4beba29d08 [automerger skipped] Protect GrantCredentialsPermissionActivity against overlay. am: deddb784d0 am: 21e36702cd am: f312c9e864 am: 6717abba6e -s ours am: 953586c0e7 -s ours am: 558392e1ed -s ours 
am skip reason: Change-Id I15dd22791fcc61ef02b06ad51d9e4409d11c0181 with SHA-1 f45dcfe1f5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13021294

Change-Id: Ia1c992e32a4383040f9a7c141635d8006a99226b
 2020-11-11 15:53:37 +00:00
Dmitry Dementyev
558392e1ed [automerger skipped] Protect GrantCredentialsPermissionActivity against overlay. am: deddb784d0 am: 21e36702cd am: f312c9e864 am: 6717abba6e -s ours am: 953586c0e7 -s ours 
am skip reason: Change-Id I15dd22791fcc61ef02b06ad51d9e4409d11c0181 with SHA-1 f45dcfe1f5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13021294

Change-Id: I8444554ac94565e9f779aea8544d8ec129183cc6
 2020-11-11 15:40:20 +00:00
Dmitry Dementyev
953586c0e7 [automerger skipped] Protect GrantCredentialsPermissionActivity against overlay. am: deddb784d0 am: 21e36702cd am: f312c9e864 am: 6717abba6e -s ours 
am skip reason: Change-Id I15dd22791fcc61ef02b06ad51d9e4409d11c0181 with SHA-1 f45dcfe1f5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13021294

Change-Id: Ia29ee5d60ed2c5b15af91b0ca8b8054dd56631c3
 2020-11-11 15:24:41 +00:00
Dmitry Dementyev
6717abba6e Protect GrantCredentialsPermissionActivity against overlay. am: deddb784d0 am: 21e36702cd am: f312c9e864 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13021294

Change-Id: Ie0a25150cbbd4aeda11f41df9fecebcac4ba7089
 2020-11-11 14:55:07 +00:00
Dmitry Dementyev
f312c9e864 Protect GrantCredentialsPermissionActivity against overlay. am: deddb784d0 am: 21e36702cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13021294

Change-Id: I3fe44a233948b572499797f954c304ab40d02f35
 2020-11-11 14:23:35 +00:00
Dmitry Dementyev
21e36702cd Protect GrantCredentialsPermissionActivity against overlay. am: deddb784d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13021294

Change-Id: I37e60418b8f67f3223692d370ced45aae46a706f
 2020-11-11 14:02:42 +00:00
Dmitry Dementyev
3be814cbff Protect GrantCredentialsPermissionActivity against overlay. am: f45dcfe1f5 am: 3f47c701f1 am: 765788de9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029378

Change-Id: Idaef7cd6bbcee766a7e25c301248daa24a04bd2b
 2020-11-11 06:44:02 +00:00
Dmitry Dementyev
765788de9a Protect GrantCredentialsPermissionActivity against overlay. am: f45dcfe1f5 am: 3f47c701f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029378

Change-Id: I59ea6157c2646c0398111718cff4af51cd4245d8
 2020-11-11 06:14:33 +00:00
Dmitry Dementyev
3f47c701f1 Protect GrantCredentialsPermissionActivity against overlay. am: f45dcfe1f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029378

Change-Id: I5259ff89a5491f6cf3c5bb0eeb12fb66ef47d494
 2020-11-11 06:00:59 +00:00
Dmitry Dementyev
ece586e321 Ignore GrantCredentials call with unexpected calling uid. 
Activity can be used only in two cases.
1) Calling uid matches uid grantee.
2) Calling uid is is system. This flow is used by getToken methods with
notifyAuthFailure=true.

Test: Existing CTS tests
Bug: 158480899
Merged-In: I1421c333b6cebb4f7cddcdd8766298f6872e933b
Change-Id: I18af48cf3cb4ad23a3e5b02a8ea1416aa5570dba
 2020-11-10 16:08:43 -08:00
Dmitry Dementyev
10d8a114bb Ignore GrantCredentials call with unexpected calling uid. 
Activity can be used only in two cases.
1) Calling uid matches uid grantee.
2) Calling uid is is system. This flow is used by getToken methods with
notifyAuthFailure=true.

Test: Existing CTS tests
Bug: 158480899
Change-Id: I1421c333b6cebb4f7cddcdd8766298f6872e933b
 2020-11-10 16:05:58 -08:00
Dmitry Dementyev
c91980e20e Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" into pi-dev am: 888ba5ee1a am: 1d3492e181 am: 427ee435bd am: 5c9473a962 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13028859

Change-Id: Iba39a9957df9d4c22759d8ac482f16de9ca0d8b0
 2020-11-10 23:49:43 +00:00
Dmitry Dementyev
5c9473a962 Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" into pi-dev am: 888ba5ee1a am: 1d3492e181 am: 427ee435bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13028859

Change-Id: I7a2396510c5333088d5c8e16dbb277c3b895e3ce
 2020-11-10 23:15:07 +00:00
Dmitry Dementyev
f45dcfe1f5 Protect GrantCredentialsPermissionActivity against overlay. 
Bug: 169763814
Test: manual
Change-Id: I15dd22791fcc61ef02b06ad51d9e4409d11c0181
 2020-11-10 22:43:31 +00:00
Dmitry Dementyev
427ee435bd Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" into pi-dev am: 888ba5ee1a am: 1d3492e181 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13028859

Change-Id: I472f2b6180738e11cc0747db1b0fd4789b0ae721
 2020-11-10 22:41:05 +00:00
TreeHugger Robot
2c216f32b0 Merge "Check that Account Parcel has name and type." into oc-dev am: 3349eaa9e8 am: 01f2d401c9 am: e0efbc5fbb am: b2f3dc0083 am: 3fbfd97e78 am: 580cab8a29 am: 3e7723bf21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999920

Change-Id: Iec2c8a8a9866aa821211686aacf2a30cfde58a1d
 2020-11-10 22:40:54 +00:00
Dmitry Dementyev
1d3492e181 Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" into pi-dev am: 888ba5ee1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13028859

Change-Id: I25446d7e0cb9eec2b98cf630bd85db30a007f6a0
 2020-11-10 22:23:04 +00:00
TreeHugger Robot
3e7723bf21 Merge "Check that Account Parcel has name and type." into oc-dev am: 3349eaa9e8 am: 01f2d401c9 am: e0efbc5fbb am: b2f3dc0083 am: 3fbfd97e78 am: 580cab8a29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999920

Change-Id: Ic0aa906b1c1f0110e2f4d25f66459a47fd6b5dd3
 2020-11-10 22:22:48 +00:00
Dmitry Dementyev
888ba5ee1a Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" into pi-dev 2020-11-10 21:44:51 +00:00
Dmitry Dementyev
c1097a8488 Revert "Ignore GrantCredentials call with unexpected calling uid." 
This reverts commit 4f0084580d.

Reason for revert: Build breakage - b/172932743

Bug: 172932743
Change-Id: Iee0a5e2b84e5d89a206b099f75a15e714a332ff4
 2020-11-10 21:44:34 +00:00
TreeHugger Robot
580cab8a29 Merge "Check that Account Parcel has name and type." into oc-dev am: 3349eaa9e8 am: 01f2d401c9 am: e0efbc5fbb am: b2f3dc0083 am: 3fbfd97e78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999920

Change-Id: I9ec8768dee14f3afc2c51498c57bc6faa085aa87
 2020-11-10 21:43:12 +00:00
TreeHugger Robot
3fbfd97e78 Merge "Check that Account Parcel has name and type." into oc-dev am: 3349eaa9e8 am: 01f2d401c9 am: e0efbc5fbb am: b2f3dc0083 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999920

Change-Id: I690493627c6d099bb133fbf881f0a13c58e6bf71
 2020-11-10 21:04:03 +00:00
Dmitry Dementyev
deddb784d0 Protect GrantCredentialsPermissionActivity against overlay. 
Bug: 169763814
Test: manual
Merged-In: I15dd22791fcc61ef02b06ad51d9e4409d11c0181
Change-Id: I0d8f901d100a5e2a022c96fa6c2be75a11c58059
 2020-11-10 20:48:09 +00:00
TreeHugger Robot
b2f3dc0083 Merge "Check that Account Parcel has name and type." into oc-dev am: 3349eaa9e8 am: 01f2d401c9 am: e0efbc5fbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999920

Change-Id: I72a0a54f22b8ebd457db1c7fa8b3757bc1f0f327
 2020-11-10 20:25:01 +00:00
TreeHugger Robot
e0efbc5fbb Merge "Check that Account Parcel has name and type." into oc-dev am: 3349eaa9e8 am: 01f2d401c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999920

Change-Id: I0e4803e7aafd730b9e21e49dc350ee51eedf42d8
 2020-11-10 19:56:49 +00:00
TreeHugger Robot
01f2d401c9 Merge "Check that Account Parcel has name and type." into oc-dev am: 3349eaa9e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12999920

Change-Id: Id4c8eb30ffbe0886360dcd3bde1ada4f08ffdefa
 2020-11-10 19:40:01 +00:00
TreeHugger Robot
3349eaa9e8 Merge "Check that Account Parcel has name and type." into oc-dev 2020-11-10 19:22:49 +00:00
Curtis Belmonte
343b788472 [automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-dev am: 4cf0088dee am: a10d4f4317 -s ours am: e422433ae5 -s ours am: 62a47dcb08 -s ours am: d2cf9d9d8b -s ours am: 77579a973b -s ours am: e65d59eb5f -s ours 
am skip reason: Change-Id I0707c3f55eaf2a69c6625a3ceb3b5626b3676b26 with SHA-1 7786f4908f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285

Change-Id: Icc885fb4e8ce75cc8d9314bd2a2acbf71db6874c
 2020-11-10 01:32:39 +00:00
Curtis Belmonte
ac318c815c [automerger skipped] DO NOT MERGE Check fingerprint client against top activity in auth callback am: bb5706541d am: bfd504c81a -s ours am: efa94e557f -s ours am: 6e185d5cad -s ours am: fd1f963c32 -s ours am: 8f077190bd -s ours am: beda396d64 -s ours 
am skip reason: Change-Id I0707c3f55eaf2a69c6625a3ceb3b5626b3676b26 with SHA-1 7786f4908f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285

Change-Id: I66d54b30d76a29a06c3344736c8b0dfe10373d79
 2020-11-10 01:32:37 +00:00
Miranda Kephart
baf4c15026 [automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-dev am: d15b2f5bce am: 0d82d9ffc9 am: a4fbde5687 -s ours am: b1b2354740 -s ours am: 29802fb39f am: 378d3ae57d -s ours am: 8254a62829 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217

Change-Id: I19a8241d8c5adbfccc53e1e19f387621d3a688d6
 2020-11-10 01:32:20 +00:00
Miranda Kephart
ecf2db455c [automerger skipped] [DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable am: 441247985a am: 40297a24eb am: 368eecbec0 -s ours am: b20d5c3add -s ours am: f69d6cfbbb am: 0bf1c91f92 -s ours am: 435a7cd8fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217

Change-Id: Ie75f95a64d120d219fa79f1a2e2706d424d2a51c
 2020-11-10 01:32:17 +00:00
Curtis Belmonte
e65d59eb5f [automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-dev am: 4cf0088dee am: a10d4f4317 -s ours am: e422433ae5 -s ours am: 62a47dcb08 -s ours am: d2cf9d9d8b -s ours am: 77579a973b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285

Change-Id: I36c060a7dc9f3570b81ae396df7f3df1a27fc816
 2020-11-10 01:16:36 +00:00
Curtis Belmonte
beda396d64 [automerger skipped] DO NOT MERGE Check fingerprint client against top activity in auth callback am: bb5706541d am: bfd504c81a -s ours am: efa94e557f -s ours am: 6e185d5cad -s ours am: fd1f963c32 -s ours am: 8f077190bd -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285

Change-Id: I231e4a7dce3cc508ea04bd7d7f840c08a58c94cc
 2020-11-10 01:16:33 +00:00
Miranda Kephart
8254a62829 [automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-dev am: d15b2f5bce am: 0d82d9ffc9 am: a4fbde5687 -s ours am: b1b2354740 -s ours am: 29802fb39f am: 378d3ae57d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217

Change-Id: Ib64d353455f4a70a88b5fa90cec66cc021d6ea8a
 2020-11-10 01:16:21 +00:00
Miranda Kephart
435a7cd8fb [automerger skipped] [DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable am: 441247985a am: 40297a24eb am: 368eecbec0 -s ours am: b20d5c3add -s ours am: f69d6cfbbb am: 0bf1c91f92 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217

Change-Id: I561248e8710ab938825682fa4c96d320e0776538
 2020-11-10 01:16:11 +00:00
Curtis Belmonte
77579a973b [automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-dev am: 4cf0088dee am: a10d4f4317 -s ours am: e422433ae5 -s ours am: 62a47dcb08 -s ours am: d2cf9d9d8b -s ours 
am skip reason: Change-Id I0707c3f55eaf2a69c6625a3ceb3b5626b3676b26 with SHA-1 7786f4908f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285

Change-Id: I1b9c84d431acacca7194f230924688af2d2e7bbd
 2020-11-10 01:02:42 +00:00
Curtis Belmonte
8f077190bd [automerger skipped] DO NOT MERGE Check fingerprint client against top activity in auth callback am: bb5706541d am: bfd504c81a -s ours am: efa94e557f -s ours am: 6e185d5cad -s ours am: fd1f963c32 -s ours 
am skip reason: Change-Id I0707c3f55eaf2a69c6625a3ceb3b5626b3676b26 with SHA-1 7786f4908f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285

Change-Id: I6e2582d9e3d89e65721b1252c4cefab62b407d20
 2020-11-10 01:02:40 +00:00
Miranda Kephart
378d3ae57d [automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-dev am: d15b2f5bce am: 0d82d9ffc9 am: a4fbde5687 -s ours am: b1b2354740 -s ours am: 29802fb39f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217

Change-Id: I5c486e1282f8d30f8326075345c68176ae77560c
 2020-11-10 01:02:27 +00:00
Miranda Kephart
0bf1c91f92 [automerger skipped] [DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable am: 441247985a am: 40297a24eb am: 368eecbec0 -s ours am: b20d5c3add -s ours am: f69d6cfbbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217

Change-Id: I781f72531fe16d4d7fcf329651013254dad465eb
 2020-11-10 01:02:24 +00:00
Curtis Belmonte
d2cf9d9d8b [automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-dev am: 4cf0088dee am: a10d4f4317 -s ours am: e422433ae5 -s ours am: 62a47dcb08 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285

Change-Id: I67f1a240fde0c05b64d4d9557df3a7736d7fcfb2
 2020-11-10 00:17:22 +00:00