Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
777,028 Commits 3 Branches 0 Tags
17127f637f62d6426ab99cbadf0e30ed2eeab4be
Commit Graph

777028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
17127f637f Merge "media: clarify that flush() is not supported for encoders." into tm-dev am: 381a3b6691 am: 946aeccb28 am: e113210f3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590094

Change-Id: I2ca97109a024644fa5059450d4013706384b8127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:08:00 +00:00
TreeHugger Robot
e113210f3b Merge "media: clarify that flush() is not supported for encoders." into tm-dev am: 381a3b6691 am: 946aeccb28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590094

Change-Id: I8fad5931a2cb0dc33523c9cdd5b7bfbb11162e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:41:56 +00:00
TreeHugger Robot
946aeccb28 Merge "media: clarify that flush() is not supported for encoders." into tm-dev am: 381a3b6691 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590094

Change-Id: Ibd253b0db18de6ee5e13bb1bd27920080ab35e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:05:47 +00:00
TreeHugger Robot
381a3b6691 Merge "media: clarify that flush() is not supported for encoders." into tm-dev 2022-05-26 09:56:47 +00:00
Lajos Molnar
01579b2c27 Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev am: 42e8a2285c am: 32caee0675 am: ece7c1814e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605610

Change-Id: I34a95b5797b0700810628e2125117c596aca50fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:16:39 +00:00
Riddle Hsu
956e43ad7d Merge "Fix death recipient leakage of WindowTokenClient" into tm-dev am: 6cc804305d am: 811a42d6dd am: d61bf5177b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596154

Change-Id: I1d51d1d8194b10e9d1d02574fe3e963d0fe901b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:16:28 +00:00
Lajos Molnar
d4f84cd87d Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev am: 42e8a2285c am: 341487c321 am: 4628f423aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605610

Change-Id: If345ca220281c49b631340f550379fc018a74ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:16:08 +00:00
Riddle Hsu
747a8fba07 Merge "Fix death recipient leakage of WindowTokenClient" into tm-dev am: 6cc804305d am: 816d5773f8 am: f61f77557d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596154

Change-Id: I2f4ec1e70b8cfab6f4928bc6350e375c59c54bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:15:58 +00:00
Jorge Gil
62fb21b9cb [automerger skipped] Merge "Allow overridding the exitPip destination bounds" into tm-dev am: 15adfe3917 am: 7f7d0c3354 am: fcc84bcac3 -s ours 
am skip reason: Merged-In Id25906c4b11e5f3c8351ba96cff80c63a6a5cf4e with SHA-1 27e49907f9 is already in history

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

Change-Id: I04148c9e624a6aa739cf242c06bf7b27ef759e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:15:37 +00:00
Jorge Gil
b01c8528d4 [automerger skipped] Merge "Allow overridding the exitPip destination bounds" into tm-dev am: 15adfe3917 am: e9fb625068 am: 3436b9ac09 -s ours 
am skip reason: Merged-In Id25906c4b11e5f3c8351ba96cff80c63a6a5cf4e with SHA-1 27e49907f9 is already in history

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

Change-Id: Ibf3b8bc7dedd9fe345d82d077f3351d71d8c1d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:15:21 +00:00
Joanne Chung
126fcff772 Merge "Revert "Rebind ContentCaptureService when the binderDied."" into tm-dev am: aa6bb0adb5 am: 8056053be7 am: bda0a274ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596156

Change-Id: I2e3a1351d9e97b3f3c941045a0b71c4b83dc352c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:14:59 +00:00
Joanne Chung
e3ffffe31a Merge "Revert "Rebind ContentCaptureService when the binderDied."" into tm-dev am: aa6bb0adb5 am: 94e6aba3af am: 86c3009d79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596156

Change-Id: Ia5f573285c86b860ae3ff93d3e6e43df08afac25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:14:38 +00:00
Lajos Molnar
5b5b8be9eb Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev am: 42e8a2285c am: 32caee0675 am: c46e9f6947 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605610

Change-Id: I6bbba22597f72283dcc4911d826b5f8dd3b8e953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:14:26 +00:00
Automerger Merge Worker
ca3e7d673f Merge "Merge "Fix death recipient leakage of WindowTokenClient" into tm-dev am: 6cc804305d am: 811a42d6dd am: 1f50538195" into tm-qpr-dev-plus-aosp 2022-05-26 08:14:22 +00:00
Riddle Hsu
6192538ddb Merge "Fix death recipient leakage of WindowTokenClient" into tm-dev am: 6cc804305d am: 811a42d6dd am: 1f50538195 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596154

Change-Id: I09a436950b4ac07d18c361ca801d07f1c2bc38ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:14:15 +00:00
Hongwei Wang
47388d2989 Merge "Use snapshot in enter content-pip animation" into tm-dev am: a143492a2b am: b3643f53a1 am: 8bef222be9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501932

Change-Id: I90d8727d7df1679a527cd046781ee57f0cc60677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:14:09 +00:00
Jorge Gil
dea5804af0 [automerger skipped] Merge "Allow overridding the exitPip destination bounds" into tm-dev am: 15adfe3917 am: 7f7d0c3354 -s ours am: 9ad68608c5 -s ours 
am skip reason: Merged-In Id25906c4b11e5f3c8351ba96cff80c63a6a5cf4e with SHA-1 2a68fc0b1a is already in history

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

Change-Id: If13f328ba033975fffc9eac88a470e6c0cdc3378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:14:00 +00:00
Automerger Merge Worker
d8304eaff5 Merge "Merge "Revert "Rebind ContentCaptureService when the binderDied."" into tm-dev am: aa6bb0adb5 am: 8056053be7 am: af571bf97e" into tm-qpr-dev-plus-aosp 2022-05-26 08:13:51 +00:00
Hongwei Wang
0b66aa771a Merge "Use snapshot in enter content-pip animation" into tm-dev am: a143492a2b am: 2484a6a5e5 am: b2b7cdf89b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501932

Change-Id: Iee655aa30877d0c0b4e9b18903dcf22e5e685206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:13:35 +00:00
Joanne Chung
8d80a17426 Merge "Revert "Rebind ContentCaptureService when the binderDied."" into tm-dev am: aa6bb0adb5 am: 8056053be7 am: af571bf97e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596156

Change-Id: I8c2ff5ce793ebc9e252304a65909294bb23be3a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:13:35 +00:00
Hongwei Wang
310d6b8e9f Merge "Use snapshot in enter content-pip animation" into tm-dev am: a143492a2b am: b3643f53a1 am: f2790fe724 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501932

Change-Id: I1d549f67846b368b8ed95533fd4156ebd4dc31f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 08:12:22 +00:00
Lajos Molnar
ece7c1814e Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev am: 42e8a2285c am: 32caee0675 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605610

Change-Id: I9896720132bbfa986d58b9156ae0b05a08db0431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:58:47 +00:00
Lajos Molnar
c46e9f6947 Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev am: 42e8a2285c am: 32caee0675 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605610

Change-Id: I5c8e57917b0b2e2a15d1581216c2de741e6ac652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:58:41 +00:00
Riddle Hsu
d61bf5177b Merge "Fix death recipient leakage of WindowTokenClient" into tm-dev am: 6cc804305d am: 811a42d6dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596154

Change-Id: I173341783101751bb5f9cfd530b24ae329141cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:58:37 +00:00
Riddle Hsu
1f50538195 Merge "Fix death recipient leakage of WindowTokenClient" into tm-dev am: 6cc804305d am: 811a42d6dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596154

Change-Id: Icad2197cac0d399eab89949268e29f03aa709d17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:58:35 +00:00
Lajos Molnar
4628f423aa Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev am: 42e8a2285c am: 341487c321 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605610

Change-Id: Ia7f9f022ac7c3b4253806ca004467e89e81e4301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:58:33 +00:00
Riddle Hsu
f61f77557d Merge "Fix death recipient leakage of WindowTokenClient" into tm-dev am: 6cc804305d am: 816d5773f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596154

Change-Id: If011ac18409a0ceda5d9732031438ce4dad91501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:58:25 +00:00
Jorge Gil
9ad68608c5 [automerger skipped] Merge "Allow overridding the exitPip destination bounds" into tm-dev am: 15adfe3917 am: 7f7d0c3354 -s ours 
am skip reason: Merged-In Id25906c4b11e5f3c8351ba96cff80c63a6a5cf4e with SHA-1 2a68fc0b1a is already in history

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

Change-Id: If092ebc2a27551580f58a7bf53c4959107fd7941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:58:16 +00:00
Jorge Gil
fcc84bcac3 Merge "Allow overridding the exitPip destination bounds" into tm-dev am: 15adfe3917 am: 7f7d0c3354 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18606671

Change-Id: I58db751a84780ac950f62e6236071a27d1a13b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:58:15 +00:00
Jorge Gil
3436b9ac09 Merge "Allow overridding the exitPip destination bounds" into tm-dev am: 15adfe3917 am: e9fb625068 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18606671

Change-Id: Id52ec015257329442c92c183e84f1ca940086ab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:58:09 +00:00
Joanne Chung
af571bf97e Merge "Revert "Rebind ContentCaptureService when the binderDied."" into tm-dev am: aa6bb0adb5 am: 8056053be7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596156

Change-Id: Ib5d79ee48273ddbed87611f8b86435ff494585ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:57:57 +00:00
Joanne Chung
bda0a274ad Merge "Revert "Rebind ContentCaptureService when the binderDied."" into tm-dev am: aa6bb0adb5 am: 8056053be7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596156

Change-Id: Ib8d524f6ca1a4b8824508f3a9abc10720f263c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:57:49 +00:00
Joanne Chung
86c3009d79 Merge "Revert "Rebind ContentCaptureService when the binderDied."" into tm-dev am: aa6bb0adb5 am: 94e6aba3af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596156

Change-Id: I9ae333665599639b3b74bbf38171b289c6d35aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:57:43 +00:00
Hongwei Wang
8bef222be9 Merge "Use snapshot in enter content-pip animation" into tm-dev am: a143492a2b am: b3643f53a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501932

Change-Id: I0b1511e3009012d99b3180dd75f5aaef4acf52ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:57:22 +00:00
Hongwei Wang
b2b7cdf89b Merge "Use snapshot in enter content-pip animation" into tm-dev am: a143492a2b am: 2484a6a5e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501932

Change-Id: Ib204ab44770afcafd51f72b4e8258b51c478b033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:57:17 +00:00
Hongwei Wang
f2790fe724 Merge "Use snapshot in enter content-pip animation" into tm-dev am: a143492a2b am: b3643f53a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501932

Change-Id: Ifcff7a1de0dd9ecebf8476db1b95f35501a9ac1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:57:00 +00:00
Lajos Molnar
32caee0675 Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev am: 42e8a2285c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605610

Change-Id: Ief786006566a9953c6be2850a595450fa1a12661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:38:10 +00:00
Riddle Hsu
811a42d6dd Merge "Fix death recipient leakage of WindowTokenClient" into tm-dev am: 6cc804305d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596154

Change-Id: I10ec3960b0062f694c3123eef31088fe21b068ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:37:52 +00:00
Jorge Gil
7f7d0c3354 Merge "Allow overridding the exitPip destination bounds" into tm-dev am: 15adfe3917 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18606671

Change-Id: Ib48fb2e5fb385b89fb672ab6b0566d401d843dfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:37:33 +00:00
Joanne Chung
8056053be7 Merge "Revert "Rebind ContentCaptureService when the binderDied."" into tm-dev am: aa6bb0adb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596156

Change-Id: I7770083ee47256969039725303c5f5de6daec565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:36:55 +00:00
Lajos Molnar
341487c321 Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev am: 42e8a2285c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605610

Change-Id: I772ea091c45c35b328f69982e47506ce70f69d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:35:54 +00:00
Riddle Hsu
816d5773f8 Merge "Fix death recipient leakage of WindowTokenClient" into tm-dev am: 6cc804305d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596154

Change-Id: I78519f8552badc9bd114879e123b77167ea4be0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:35:22 +00:00
Jorge Gil
e9fb625068 Merge "Allow overridding the exitPip destination bounds" into tm-dev am: 15adfe3917 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18606671

Change-Id: If2e0f8cdea064978ab91ea384a6e5fe28e55dcd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:35:01 +00:00
Hongwei Wang
b3643f53a1 Merge "Use snapshot in enter content-pip animation" into tm-dev am: a143492a2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501932

Change-Id: Iaf6616d4873db8803bdf15246ef85e0553a0e5f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:34:42 +00:00
Joanne Chung
94e6aba3af Merge "Revert "Rebind ContentCaptureService when the binderDied."" into tm-dev am: aa6bb0adb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18596156

Change-Id: If20019a808ee7d076737a67075b747daf27e4012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:34:13 +00:00
Hongwei Wang
2484a6a5e5 Merge "Use snapshot in enter content-pip animation" into tm-dev am: a143492a2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501932

Change-Id: I5ba1c038807bd8d61ebeec36e98084bc8937e8ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:33:29 +00:00
Lajos Molnar
42e8a2285c Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev 2022-05-26 07:26:32 +00:00
Riddle Hsu
6cc804305d Merge "Fix death recipient leakage of WindowTokenClient" into tm-dev 2022-05-26 06:51:34 +00:00
Jorge Gil
15adfe3917 Merge "Allow overridding the exitPip destination bounds" into tm-dev 2022-05-26 06:47:25 +00:00
Joanne Chung
aa6bb0adb5 Merge "Revert "Rebind ContentCaptureService when the binderDied."" into tm-dev 2022-05-26 06:27:22 +00:00