Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
825,126 Commits 3 Branches 0 Tags
53a6c3fcecaeea95422bf8a6cb6bdb2a195850da
Commit Graph

825126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Yu
53a6c3fcec [automerger skipped] Merge "[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews" into rvc-qpr-dev am: 0590bd0072 -s ours am: 5fee6c5cbb -s ours am: c2c22b7800 -s ours am: af828e2c8e -s ours am: 42ae7cd3dc -s ours am: 9158e93435 -s ours am: a9f3332a53 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93293e6992113fa780401546d2d6305de422e4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 00:30:18 +00:00
Tim Yu
f86c9e55d8 [automerger skipped] [DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews am: 5c72cd4809 -s ours am: bb05da7b1a -s ours am: 53af167e83 -s ours am: 2960cf1c0d -s ours am: 412d006017 -s ours am: ff6ead7a44 -s ours am: 456d3f16db -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie113612a1d9ce57afaad56b3a2ff129606e30d07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 00:30:01 +00:00
Tim Yu
a9f3332a53 [automerger skipped] Merge "[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews" into rvc-qpr-dev am: 0590bd0072 -s ours am: 5fee6c5cbb -s ours am: c2c22b7800 -s ours am: af828e2c8e -s ours am: 42ae7cd3dc -s ours am: 9158e93435 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3777de73e59b4b60601251d431a82d5bc4b0595d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 23:51:06 +00:00
Tim Yu
456d3f16db [automerger skipped] [DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews am: 5c72cd4809 -s ours am: bb05da7b1a -s ours am: 53af167e83 -s ours am: 2960cf1c0d -s ours am: 412d006017 -s ours am: ff6ead7a44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6322cb96fd6f8746a7c44c46d0015e134d98d1fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 23:50:53 +00:00
Tim Yu
9158e93435 [automerger skipped] Merge "[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews" into rvc-qpr-dev am: 0590bd0072 -s ours am: 5fee6c5cbb -s ours am: c2c22b7800 -s ours am: af828e2c8e -s ours am: 42ae7cd3dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94726cf430d6a431fc176057fe59393293205977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 23:09:03 +00:00
Tim Yu
ff6ead7a44 [automerger skipped] [DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews am: 5c72cd4809 -s ours am: bb05da7b1a -s ours am: 53af167e83 -s ours am: 2960cf1c0d -s ours am: 412d006017 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8852175d1b355f50e54f97db561a18cc7583568b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 23:08:57 +00:00
Tim Yu
42ae7cd3dc [automerger skipped] Merge "[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews" into rvc-qpr-dev am: 0590bd0072 -s ours am: 5fee6c5cbb -s ours am: c2c22b7800 -s ours am: af828e2c8e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a567e12288e0d7e04e7947d9a2b4b7155ac6d29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 22:22:54 +00:00
Tim Yu
412d006017 [automerger skipped] [DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews am: 5c72cd4809 -s ours am: bb05da7b1a -s ours am: 53af167e83 -s ours am: 2960cf1c0d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3617fa25e625438015bb2026516f27fec6eac43d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 22:22:21 +00:00
Tim Yu
af828e2c8e [automerger skipped] Merge "[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews" into rvc-qpr-dev am: 0590bd0072 -s ours am: 5fee6c5cbb -s ours am: c2c22b7800 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied6ccdaf5bc57d55d8215437b7cced388957396e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 21:45:14 +00:00
Tim Yu
2960cf1c0d [automerger skipped] [DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews am: 5c72cd4809 -s ours am: bb05da7b1a -s ours am: 53af167e83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic37712698fecceed6989baf4fdc54dd41c520d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 21:45:08 +00:00
Austin Borger
fbad94fbde Merge "Camera: Clear identity before access device policy manager" into main am: 6cc598239e am: 63827abeb6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2652179

Change-Id: I4b398800a92462b0d3b192208296d1c77762ac5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 21:44:01 +00:00
Austin Borger
63827abeb6 Merge "Camera: Clear identity before access device policy manager" into main am: 6cc598239e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2652179

Change-Id: I3784e485d5b11068d167e76b1e96e168157b7b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 21:00:42 +00:00
Tim Yu
c2c22b7800 [automerger skipped] Merge "[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews" into rvc-qpr-dev am: 0590bd0072 -s ours am: 5fee6c5cbb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6b4ff49a7ac2e1e7404ddc1230252051f4860fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 20:58:07 +00:00
Tim Yu
53af167e83 [automerger skipped] [DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews am: 5c72cd4809 -s ours am: bb05da7b1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47e5e70205b87122ee5d912689ea33da4d139b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 20:58:03 +00:00
Treehugger Robot
5abd13f53d Merge "Fix Rsa-Oaep operation begin on T+GSI build" into main am: 51bf3fd503 am: 5f753cfcbf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2650396

Change-Id: I24c386730c05fdcc698ab760644aa5b331e34b85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 20:37:25 +00:00
Elliott Hughes
f1293aed8e Merge "Switch from minigzip to gzip." into main am: ef9965e2bc am: 2bd7b8edd7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2631992

Change-Id: I3f51636ae86690322ff0fc894eb760f70ed47f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 20:36:45 +00:00
Austin Borger
6cc598239e Merge "Camera: Clear identity before access device policy manager" into main 2023-07-10 20:26:19 +00:00
Tim Yu
5fee6c5cbb [automerger skipped] Merge "[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews" into rvc-qpr-dev am: 0590bd0072 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I809edb81652876be8e71442955011d2c0f4e7e3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 20:14:01 +00:00
Tim Yu
bb05da7b1a [automerger skipped] [DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews am: 5c72cd4809 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie864e3af0562831c2d6c7d1aa7759e944ede9d14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 20:13:47 +00:00
Treehugger Robot
5f753cfcbf Merge "Fix Rsa-Oaep operation begin on T+GSI build" into main am: 51bf3fd503 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2650396

Change-Id: I3b1fdd95fc635da42179428f0ce4c89fa5ba950a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:56:16 +00:00
Elliott Hughes
2bd7b8edd7 Merge "Switch from minigzip to gzip." into main am: ef9965e2bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2631992

Change-Id: I997a0616ced57fa6605de457df4d443c129ea839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:55:13 +00:00
Treehugger Robot
f4db37b034 [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6fd0 -s ours am: 41cce389fd -s ours am: 354583d7f1 -s ours am: 04b584c402 -s ours am: e48e6ed9f9 -s ours am: 7bcfc61d96 -s ours am: 510073965d -s ours am: d93648d055 -s ours 
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

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

Change-Id: I8ef500765d23b05d631cda0ea648e211b8cb5452
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:53:25 +00:00
Beth Thibodeau
3427f2a58f [automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours am: b0a33db6d6 -s ours am: e3b5c470b9 -s ours am: 779c9e902d -s ours am: 25fc1e7d44 -s ours am: 9699b871e9 -s ours am: 51b54688a3 -s ours 
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

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

Change-Id: I695cf1cdccc3db3ddf71774947eabfd571c19654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:52:56 +00:00
Tim Yu
0590bd0072 Merge "[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews" into rvc-qpr-dev 2023-07-10 19:46:40 +00:00
Tim Yu
b9743c8a04 Merge "[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews" into tm-qpr-dev-plus-aosp 2023-07-10 19:39:31 +00:00
Treehugger Robot
51bf3fd503 Merge "Fix Rsa-Oaep operation begin on T+GSI build" into main 2023-07-10 19:30:01 +00:00
Elliott Hughes
ef9965e2bc Merge "Switch from minigzip to gzip." into main 2023-07-10 19:22:45 +00:00
Treehugger Robot
d93648d055 [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6fd0 -s ours am: 41cce389fd -s ours am: 354583d7f1 -s ours am: 04b584c402 -s ours am: e48e6ed9f9 -s ours am: 7bcfc61d96 -s ours am: 510073965d -s ours 
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

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

Change-Id: I5596c38f2aa584bf06d455108f396a02e5b59f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:11:50 +00:00
Beth Thibodeau
51b54688a3 [automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours am: b0a33db6d6 -s ours am: e3b5c470b9 -s ours am: 779c9e902d -s ours am: 25fc1e7d44 -s ours am: 9699b871e9 -s ours 
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

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

Change-Id: Ie9cda965f207c181d8416b79832642ebe6d69d9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:11:28 +00:00
Josep del Río
71fb10ba92 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours am: baf0b865c5 -s ours am: c93d0f50d7 -s ours am: 5fa491d564 -s ours am: b2fcb236e4 -s ours 
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

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

Change-Id: I25634442304214598c077ed2a6fb9b5fb6813445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 18:48:32 +00:00
Treehugger Robot
510073965d [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6fd0 -s ours am: 41cce389fd -s ours am: 354583d7f1 -s ours am: 04b584c402 -s ours am: e48e6ed9f9 -s ours am: 7bcfc61d96 -s ours 
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

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

Change-Id: I019bff03be499736aca93aa5b33b78b549e2bfbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 18:30:02 +00:00
Beth Thibodeau
9699b871e9 [automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours am: b0a33db6d6 -s ours am: e3b5c470b9 -s ours am: 779c9e902d -s ours am: 25fc1e7d44 -s ours 
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

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

Change-Id: I8a8bd59290503b6db8dff653dc1d1689307c928f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 18:29:58 +00:00
Josep del Río
b2fcb236e4 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours am: baf0b865c5 -s ours am: c93d0f50d7 -s ours am: 5fa491d564 -s ours 
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

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

Change-Id: I51295992f9b214e82c970910f8a9f8d7697b6cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 18:09:03 +00:00
Prashant Patil
dde5ebaa58 Fix Rsa-Oaep operation begin on T+GSI build 
Mixed build of Android T + U GSI misses to add RSA_OAEP_MGF_DIGEST in
key begin operation parameters and hence RSA cipher operation fails.
This was due to Keymint 200 implementation in Android T supported
RSA_OAEP_MGF_DIGEST tag but did not included into key characteristics and
the check in AndroidKeyStoreRSACipherSpi fails on Android T + U GSI
builds.

To fix this issue additional condition added to check if key
characteristics do not have RSA_OAEP_MGF_DIGEST tag but the KeyMint
version is 200 then it has to include in operation parameters.

Bug: 289859292
Bug: 289749312
Bug: 287891167
Bug: 287532460
Test: atest  CtsKeystoreWycheproofTestCases:com.google.security.wycheproof.RsaOaepTest
Test: atest CtsKeystoreTestCases:android.keystore.cts.CipherTest#testKatBasicWithDifferentProviders
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d8b18413ade6ba13817caae52abdffc609a92d89)
Merged-In: I13ca50a45e733276d1451d17904780eff86bf296
Change-Id: I13ca50a45e733276d1451d17904780eff86bf296
 2023-07-10 17:46:16 +00:00
Treehugger Robot
7bcfc61d96 [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6fd0 -s ours am: 41cce389fd -s ours am: 354583d7f1 -s ours am: 04b584c402 -s ours am: e48e6ed9f9 -s ours 
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

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

Change-Id: I5be0265f4fcd99af38c1646cd4f8c6bc103e7d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 17:42:51 +00:00
Beth Thibodeau
25fc1e7d44 [automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours am: b0a33db6d6 -s ours am: e3b5c470b9 -s ours am: 779c9e902d -s ours 
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

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

Change-Id: I60bb75ae934b489d1776b9bd377c938b8e283506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 17:42:18 +00:00
Josep del Río
5fa491d564 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours am: baf0b865c5 -s ours am: c93d0f50d7 -s ours 
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

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

Change-Id: Ia3a2a0a0278653d7c9cf81b8708bba8add263a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 17:26:12 +00:00
Treehugger Robot
e48e6ed9f9 [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6fd0 -s ours am: 41cce389fd -s ours am: 354583d7f1 -s ours am: 04b584c402 -s ours 
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

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

Change-Id: I4e450886397aee13509979d82a2eb07824d13368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 17:05:50 +00:00
Beth Thibodeau
779c9e902d [automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours am: b0a33db6d6 -s ours am: e3b5c470b9 -s ours 
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

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

Change-Id: I65fdc91f7ce01ec9a35ddab15ff6154edf85ebc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 17:05:34 +00:00
Mady Mellor
17a4732913 Merge "Avoid CalledFromWrongThreadException in BubbleController" into main am: bc38028c8d am: c187a5cdb0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2637729

Change-Id: Ifd0a25d46f53fd5786dda202f67adfa4c57fe811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 17:04:42 +00:00
Colin Cross
d75cd1490c Merge "Enable ptrace on userdebug when JDWP is disabled" into main am: e59b750030 am: ef0fcdb1ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2650574

Change-Id: I7f1ee47ff5fafbfdf9d6c454f6fde68920c72f7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 17:04:25 +00:00
Mady Mellor
c187a5cdb0 Merge "Avoid CalledFromWrongThreadException in BubbleController" into main am: bc38028c8d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2637729

Change-Id: I0fd447ddbf810090e19305b2dc8278acd6e0887d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 16:45:25 +00:00
Josep del Río
c93d0f50d7 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours am: baf0b865c5 -s ours 
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

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

Change-Id: Ie2a9b1474e9a875bbdcd6310a29da0f6ddeff8b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 16:39:38 +00:00
Mady Mellor
bc38028c8d Merge "Avoid CalledFromWrongThreadException in BubbleController" into main 2023-07-10 16:25:17 +00:00
Colin Cross
ef0fcdb1ff Merge "Enable ptrace on userdebug when JDWP is disabled" into main am: e59b750030 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2650574

Change-Id: Ie355bc8eab34f33dada114891eda5a71be817c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 16:22:53 +00:00
Treehugger Robot
04b584c402 [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6fd0 -s ours am: 41cce389fd -s ours am: 354583d7f1 -s ours 
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

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

Change-Id: I0af03a25f80cda0f9816dcad4efe77dd4d74bc26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 16:20:29 +00:00
Beth Thibodeau
e3b5c470b9 [automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours am: b0a33db6d6 -s ours 
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

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

Change-Id: I4dfa2e48c373cc08e5ec334fbd56a78e1181d0fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 16:20:17 +00:00
Josep del Río
baf0b865c5 [automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours 
am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history

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

Change-Id: If25c271657fd7376080417589fb54a0507c8f872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 16:03:01 +00:00
Colin Cross
e59b750030 Merge "Enable ptrace on userdebug when JDWP is disabled" into main 2023-07-10 15:39:59 +00:00
Treehugger Robot
354583d7f1 [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6fd0 -s ours am: 41cce389fd -s ours 
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history

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

Change-Id: Ic0f26b17a8c00131c925f2ea595121adade13132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 15:38:33 +00:00