summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-04Make change and version bump to r_aml_301501700 for mainline module file: ↵android-mainline-11.0.0_r6android11-mainline-sparse-2021-jan-releaseandroid-build-team Robot
apex/permission/apex_manifest.json Change-Id: I53390784f9d29735692c6628b38682541b7dbc6d
2021-02-03Make change and version bump to r_aml_301501601 for mainline module file: ↵android-build-team Robot
apex/permission/apex_manifest.json Change-Id: Id159c037bf7a7927977ea3e9ec79dd3b64fc0adb
2021-01-27Make change and version bump to r_aml_301501600 for mainline module file: ↵android-build-team Robot
apex/permission/apex_manifest.json Change-Id: I619695cd811097853bfb73223d10b3891709198b
2021-01-25Make change and version bump to r_aml_301501501 for mainline module file: ↵android-build-team Robot
apex/permission/apex_manifest.json Change-Id: Iad02c12ce36b7d91eb7b612539739b9c951b7218
2020-12-14Version bump to r_aml_301501400 [apex/permission/apex_manifest.json]android-mainline-11.0.0_r4android-build-team Robot
Change-Id: I62409c229a49dc52ac0f671dd27d1bebf6c3d0e5
2020-12-14Version bump to r_aml_301501300 [apex/permission/apex_manifest.json]android-build-team Robot
Change-Id: I7410dd86dea8db0f61771fbf1d110ebe86ff72a6
2020-12-14Version bump to r_aml_301501200 [apex/permission/apex_manifest.json]android-build-team Robot
Change-Id: I675d925b49e2e18f6535cfdfed3775f3df0e9827
2020-12-09Version bump to r_aml_301501100 [apex/permission/apex_manifest.json]android-build-team Robot
Change-Id: I73aae5b4ad3bc8cd7468334fc251f66da7ecf451
2020-12-07Make change and version bump to r_aml_301501000 for mainline module file: ↵android-build-team Robot
apex/permission/apex_manifest.json Change-Id: I67e1341b57d0b472c331f7b1fa5bed81a94b7e14
2020-12-02Make change and version bump to r_aml_301500900 for mainline module file: ↵android-build-team Robot
apex/permission/apex_manifest.json Change-Id: I92f1fe8f774efe8f26e036a11ee14c99808622a7
2020-11-24Make change and version bump to r_aml_301500800 for mainline module file: ↵android-build-team Robot
apex/permission/apex_manifest.json Change-Id: Idba03ea34746d946a17e6898c24777a914b854c4
2020-11-24Add null check to getAppContentDescriptionNate Myren
Bug: 173798457 Test: atest LocationPermissionAppsFragmentTest Change-Id: I547222211e99645443354bd262b6833990fc3792 (cherry picked from commit d1dea94ffecbe6ffd2186d15790c116cc1b8704a)
2020-11-20Make change and version bump to r_aml_301500700 for mainline module file: ↵android-build-team Robot
apex/permission/apex_manifest.json Change-Id: I74690c615fd0350456eba8065b11271f9e9206da
2020-11-19Move AbandonSessionsRule to be shared by multiple host testsJW Wang
This is a partial cherry pick of the change Ib7b32fbd7b1133ac6a8e6782234a4fe2c5a782bd Test: sdkextensions_e2e_tests Change-Id: Iec98d08ce8b281fd5ef7f06a44235504a5f302ad Merged-In: Ib7b32fbd7b1133ac6a8e6782234a4fe2c5a782bd
2020-11-19Add AbandonSessionsRuleJW Wang
This is a partial cherry-pick of the change I3ad6317eaee3ffb4c6351c630460dd8f1d27e644 Test: sdkextensions_e2e_tests Change-Id: Ica17fdf745cedfc54567666b8231f89ee7f20a7b Merged-In: I3ad6317eaee3ffb4c6351c630460dd8f1d27e644
2020-11-18Make change and version bump to r_aml_301500600 for mainline module file: ↵android-build-team Robot
apex/permission/apex_manifest.json Change-Id: Iada4f5db33e32a92381aac14e01e72dba866f9a9
2020-11-18Separate 2 tests to verify canBeSatisfiedBy()Lucas Lin
In Android R, NetworkSpecifier#satisfiedBy() has changed to NetworkSpecifier#canBeSatisfiedBy(), but its subclass - MatchAllNetworkSpecifier hasn't. In Android S, both of MatchAllNetworkSpecifier and NetworkSpecifier has changed satisfiedBy() to canBeSatisfiedBy(). So if running the latest CTS on R device, it will verify NetworkSpecifier#canBeSatisfiedBy() instead of MatchAllNetworkSpecifier#satisfiedBy() and get the unexpected result. The fix is to separate 2 tests to verify canBeSatisfiedBy(), one is for Android R or older version and the other is for Android S+. Bug: 172401624 Test: Run MatchAllNetworkSpecifierTest on Android R and S. Change-Id: I9aeddaa3e331f609bbdba8ab0c2d6e014123f242 Merged-In: I1391bae9a0fc0298beb8fe80b5f388b492244566
2020-11-18Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifierRambo Wang
MatchAllNetworkSpecifier is a subclass of NetworkSpecifer. The method satisfiedBy should be renamed to canBeSatisfiedBy together with other subclass of NetworkSpecifer in b/152238712. Add annotation @Overide for the method to make sure it will not get ignored when refactor in the future. Bug: 154956584 Test: atest android.net.MatchAllNetworkSpecifierTest Original-Change: https://android-review.googlesource.com/1295946 Merged-In: Ibe32fd50fae43aa635c1c0dad66eaea82011c8b7 Change-Id: Ibe32fd50fae43aa635c1c0dad66eaea82011c8b7
2020-11-16Merge "permission: Set min_sdk_version to "30"" into mainline-prodNikita Ioffe
2020-11-16Make change and version bump to r_aml_301400700 for mainline module file: ↵android-build-team Robot
packages/Tethering/apex/manifest.json Change-Id: Ic2f7619ed84523229265e099a2e831c34968bd37
2020-11-13statsd: Set min_sdk_version to "30"Nikita Ioffe
Just a cosmetic cleanup since "R" resolves to 30 as well. Test: m Bug: 171330443 Merged-In: I6c6785b93f64a89633fcc7e64116d7a2f4578d2a Change-Id: I6c6785b93f64a89633fcc7e64116d7a2f4578d2a (cherry picked from commit e6ea94960c8d16f021c80b9df1ca79993a1bf608)
2020-11-12permission: Set min_sdk_version to "30"Nikita Ioffe
Just a cosmetic cleanup since "R" resolves to 30 as well. Test: m Bug: 171330443 Merged-In: I83dcc7be1ff18e6429955a0fee2596d8b0e19a25 Change-Id: I83dcc7be1ff18e6429955a0fee2596d8b0e19a25 (cherry picked from commit 683689831113c113b0a50141ba0d5ec461910fc8)
2020-11-11[automerger skipped] Merge "Ignore GrantCredentials call with unexpected ↵Dmitry Dementyev
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: I3ee8675c750a217e53a23c3c320394ae84d0480b
2020-11-11Merge "Ignore GrantCredentials call with unexpected calling uid." into ↵Dmitry Dementyev
qt-dev am: a064b69f18 am: f0263a9369 am: 4290008125 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029782 Change-Id: I881f319fe82ea815a96ee0285f64ee031eee3de5
2020-11-11[automerger skipped] Merge "Ignore GrantCredentials call with unexpected ↵Dmitry Dementyev
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-11Merge "Ignore GrantCredentials call with unexpected calling uid." into ↵Dmitry Dementyev
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[automerger skipped] Merge "Ignore GrantCredentials call with unexpected ↵Dmitry Dementyev
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[automerger skipped] Merge "Ignore GrantCredentials call with unexpected ↵Dmitry Dementyev
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-11Merge "Ignore GrantCredentials call with unexpected calling uid." into ↵Dmitry Dementyev
qt-dev am: a064b69f18 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029782 Change-Id: Ibf0233c8e736166a6357d622a5f5763cca64c07a
2020-11-11Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-devDmitry Dementyev
2020-11-11Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-devDmitry Dementyev
2020-11-11Merge "DO NOT MERGE mainline-prod: enable CtsWifiTestCases in presubmit" ↵David Su
into mainline-prod
2020-11-11[automerger skipped] Protect GrantCredentialsPermissionActivity against ↵Dmitry Dementyev
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: I616fb310b591ddde94e8f06e85694712d3f0058d
2020-11-11[automerger skipped] Protect GrantCredentialsPermissionActivity against ↵Dmitry Dementyev
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[automerger skipped] Protect GrantCredentialsPermissionActivity against ↵Dmitry Dementyev
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[automerger skipped] Protect GrantCredentialsPermissionActivity against ↵Dmitry Dementyev
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-11Protect GrantCredentialsPermissionActivity against overlay. am: deddb784d0 ↵Dmitry Dementyev
am: 21e36702cd am: f312c9e864 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13021294 Change-Id: Ie0a25150cbbd4aeda11f41df9fecebcac4ba7089
2020-11-11Protect GrantCredentialsPermissionActivity against overlay. am: deddb784d0 ↵Dmitry Dementyev
am: 21e36702cd Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13021294 Change-Id: I3fe44a233948b572499797f954c304ab40d02f35
2020-11-11Protect GrantCredentialsPermissionActivity against overlay. am: deddb784d0Dmitry Dementyev
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13021294 Change-Id: I37e60418b8f67f3223692d370ced45aae46a706f
2020-11-11Protect GrantCredentialsPermissionActivity against overlay. am: f45dcfe1f5 ↵Dmitry Dementyev
am: 3f47c701f1 am: 765788de9a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029378 Change-Id: I109082c688a79e2d4a94277d2eab4dd7b8f9747e
2020-11-11Protect GrantCredentialsPermissionActivity against overlay. am: f45dcfe1f5 ↵Dmitry Dementyev
am: 3f47c701f1 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029378 Change-Id: I59ea6157c2646c0398111718cff4af51cd4245d8
2020-11-11Protect GrantCredentialsPermissionActivity against overlay. am: f45dcfe1f5Dmitry Dementyev
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029378 Change-Id: I5259ff89a5491f6cf3c5bb0eeb12fb66ef47d494
2020-11-10Ignore GrantCredentials call with unexpected calling uid.Dmitry Dementyev
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-10Ignore GrantCredentials call with unexpected calling uid.Dmitry Dementyev
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-10Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" ↵Dmitry Dementyev
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: I86877a40c49d8e4a4f4102881c3a1ec50fccbe0d
2020-11-10Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" ↵Dmitry Dementyev
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-10Protect GrantCredentialsPermissionActivity against overlay.Dmitry Dementyev
Bug: 169763814 Test: manual Change-Id: I15dd22791fcc61ef02b06ad51d9e4409d11c0181
2020-11-10Merge "Check that Account Parcel has name and type." into oc-dev am: ↵TreeHugger Robot
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: Ifa3f6c7de60d4a4e7196db11aec7301bd6f022c6
2020-11-10Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" ↵Dmitry Dementyev
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-10Make change and version bump to r_aml_301400600 for mainline module file: ↵android-build-team Robot
packages/Tethering/apex/manifest.json Change-Id: I69f8708ff2e685e6d1e00c66c0813e60895754d1
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 01:50:18 +0000