Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
772,655 Commits 3 Branches 0 Tags
47159a58fc5f495e80906d72d5367bcaf876e58b
Commit Graph

772655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
T.J. Mercier
47159a58fc Merge "Revert "Freeze all package processes before killing"" am: f19a97c28e am: 18ecbf182e am: cae8f1e9d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128954

Change-Id: I8e6a97abb0abf6a1f9d7ae683b57e1dae04e1036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:31:16 +00:00
Ben Miles
ebed14c321 Merge "Add ANR info to traces for all builds" into tm-dev am: a2b0efdc12 am: ce647a5e0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18870966

Change-Id: I4e662b7d534c639b024ee0283d1642a6f360776b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:31:00 +00:00
T.J. Mercier
cae8f1e9d3 Merge "Revert "Freeze all package processes before killing"" am: f19a97c28e am: 18ecbf182e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128954

Change-Id: I5594e8e2ccfa33c443d91f4168cd88b3efaa8a41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:30:11 +00:00
Ben Miles
ce647a5e0f Merge "Add ANR info to traces for all builds" into tm-dev am: a2b0efdc12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18870966

Change-Id: I453d8dbf386bf1884588f0f0596cd611414ed97d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:11:59 +00:00
T.J. Mercier
18ecbf182e Merge "Revert "Freeze all package processes before killing"" am: f19a97c28e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128954

Change-Id: I30b821e910893479da17a6788fed7333dc1b9a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:03:26 +00:00
Ben Miles
a2b0efdc12 Merge "Add ANR info to traces for all builds" into tm-dev 2022-06-21 15:52:58 +00:00
T.J. Mercier
f19a97c28e Merge "Revert "Freeze all package processes before killing"" 2022-06-21 15:41:36 +00:00
Automerger Merge Worker
ef1f6a51bc Merge "Merge "Use top activity for fixed rotation from snapshot starting window" into tm-dev am: d6ad543b7c am: ff3c85f51b" into tm-d1-dev-plus-aosp 2022-06-21 15:18:41 +00:00
Riddle Hsu
d209794736 Merge "Use top activity for fixed rotation from snapshot starting window" into tm-dev am: d6ad543b7c am: 2ce5ae581e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18924772

Change-Id: I2a3354f31ce4cc4bba11721538f6c422cd9fa4fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 15:18:34 +00:00
Riddle Hsu
fd8aa8fc05 Merge "Use top activity for fixed rotation from snapshot starting window" into tm-dev am: d6ad543b7c am: ff3c85f51b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18924772

Change-Id: I7bb5131af85bd2ddfee371830fd447c4da0ee460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 15:18:34 +00:00
Riddle Hsu
ff3c85f51b Merge "Use top activity for fixed rotation from snapshot starting window" into tm-dev am: d6ad543b7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18924772

Change-Id: I1d1621dc2aa8cac0e9b34ceb66b65e4f607e07f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 15:03:36 +00:00
Riddle Hsu
2ce5ae581e Merge "Use top activity for fixed rotation from snapshot starting window" into tm-dev am: d6ad543b7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18924772

Change-Id: I327d10168fa2acc960c7f0bccd3300270b322e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 15:01:44 +00:00
Riddle Hsu
d6ad543b7c Merge "Use top activity for fixed rotation from snapshot starting window" into tm-dev 2022-06-21 14:40:15 +00:00
Riddle Hsu
832730d33a Use top activity for fixed rotation from snapshot starting window 
Assume T=trampoline activity, M=main activity.
When launching T into an existing task which contains the existing M:
The task will have
 Top    = T (no window)  = 'activity'
 Bottom = M (has window) = 'topFullscreenActivity'
Because the real top launching activity is T, we should use it
for checking whether to apply fix rotation. Otherwise fixed rotation
will be skipped because M is not the current top activity, which
will cause the snapshot starting window to be half cropped.

Also make sure the trampoline activity has the same rotation as
the snapshot. Because the snapshot starting window will be shown
on the trampoline first and then transfer to the existing activity.

This relates to commit a95bd4a that enables snapshot starting window
to take effect across trampoline activity.

Bug: 236200669
Test: Assume A,B are landscape singleTask activities with the same
      task affinity. A will be finished (clear-task-stack) after
      starting B. Launch the app and return to home and launch it
      again. The starting window should not be cropped.

Change-Id: I11cea671c0e6b9a58ba28f28ce0f735eb576c55d
 2022-06-21 20:15:21 +08:00
Jing Ji
e90bb605b6 Merge "Recheck the condition before really killing" am: f24ac73825 am: c2cbdc7065 am: 7c944d37a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2121361

Change-Id: Ic81186df4a8f42089423abaca43325ca96dbe9fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:27:51 +00:00
Jing Ji
7c944d37a0 Merge "Recheck the condition before really killing" am: f24ac73825 am: c2cbdc7065 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2121361

Change-Id: Ie6d2d6958b27e59b3ccb9ca8f16d2e680758a8d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 03:59:44 +00:00
Jing Ji
c2cbdc7065 Merge "Recheck the condition before really killing" am: f24ac73825 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2121361

Change-Id: I3d1793941c3a96133b51e787008e1c6fb82566fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 03:42:48 +00:00
Jing Ji
f24ac73825 Merge "Recheck the condition before really killing" 2022-06-21 03:27:33 +00:00
Vadim Caen
fc8a90ef89 [automerger skipped] Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce am: b38e19fdc3 -s ours 
am skip reason: Merged-In I54d843f11130a78ed5a68cbe4722e601a2086ee1 with SHA-1 a2e45f1ed1 is already in history

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

Change-Id: Ifdb2b611df4e2cf9b512bc2ec8bdee36b1e4c063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 21:20:39 +00:00
Automerger Merge Worker
a65204ff03 Merge "Merge "Update the docs for the provisioning extra AllowOffline." into tm-dev am: 2dc5f6e9f5 am: bd04837ecb" into tm-d1-dev-plus-aosp 2022-06-20 21:20:06 +00:00
Vadim Caen
f238735a02 Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce am: 0592820f44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18794217

Change-Id: Ia11db8e296958a5a8598e29d8719ba38784e14e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 21:19:56 +00:00
Elis Elliott
dc94992144 Merge "Update the docs for the provisioning extra AllowOffline." into tm-dev am: 2dc5f6e9f5 am: bd04837ecb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18909940

Change-Id: I8b35f1844b0505292d58a3f6ec6a23f244dae277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 21:19:40 +00:00
Elis Elliott
308156b466 Merge "Update the docs for the provisioning extra AllowOffline." into tm-dev am: 2dc5f6e9f5 am: 7162d46aba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18909940

Change-Id: I9413544d8eae9110e76b57fcfb1637696ce24e38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 21:19:21 +00:00
Vadim Caen
b38e19fdc3 Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18794217

Change-Id: I8054556537104bb80d940272b367ed9b8ffa520c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 21:02:34 +00:00
Vadim Caen
0592820f44 Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18794217

Change-Id: I990a9bf95d596c867a972b916518c7d9d1c4355e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 21:02:31 +00:00
Elis Elliott
7162d46aba Merge "Update the docs for the provisioning extra AllowOffline." into tm-dev am: 2dc5f6e9f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18909940

Change-Id: Ib13c6851c1f1842a72e6182567ecb8d2ce16a17b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 21:00:45 +00:00
Elis Elliott
bd04837ecb Merge "Update the docs for the provisioning extra AllowOffline." into tm-dev am: 2dc5f6e9f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18909940

Change-Id: Iff5171f233650802dc84140501bd076a4f115f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 20:58:55 +00:00
Vadim Caen
1c6de844ce Merge "Prevent callback registration when back flag is disabled" into tm-dev 2022-06-20 18:53:00 +00:00
Elis Elliott
2dc5f6e9f5 Merge "Update the docs for the provisioning extra AllowOffline." into tm-dev 2022-06-20 17:10:01 +00:00
Miguel Aranda
4d33dfeaf1 Merge "Fix ByteBufferBulkPerfTest issues by shortening param & test names." am: 5c73e446de am: 29267e1b30 am: b991caa231 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128773

Change-Id: I73ac0f4f830c2582d5af66948042ecf21eb1f9f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 15:04:14 +00:00
Miguel Aranda
0ed3433154 Merge "More libcore benchmarks" am: 464ee3d1f1 am: 083f2e7266 am: 3c0701c1af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2100170

Change-Id: I4999b2c7073e55073c77cf49dad8ba45eddbfd45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 15:03:59 +00:00
Treehugger Robot
d59a1811e1 [automerger skipped] Merge "Merge SQ3A.220605.009" am: eb681f393e am: 9f29cec28d -s ours am: 25c8b58d38 -s ours 
am skip reason: Merged-In I080df3547361aef1aa259dd2b3dc9bdb860a0193 with SHA-1 a2e8e22971 is already in history

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

Change-Id: I5f4ee41442ce3e31ca47a1e15c7dd1be433dbfa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 15:03:13 +00:00
Miguel Aranda
b991caa231 Merge "Fix ByteBufferBulkPerfTest issues by shortening param & test names." am: 5c73e446de am: 29267e1b30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128773

Change-Id: Ide3d0947d17d7275c4c4f7245195bd50bfb7a1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 14:38:35 +00:00
Miguel Aranda
3c0701c1af Merge "More libcore benchmarks" am: 464ee3d1f1 am: 083f2e7266 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2100170

Change-Id: Ic696ac55be3d4d850b87d3dc6764ea8391451185
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 14:37:44 +00:00
Treehugger Robot
25c8b58d38 [automerger skipped] Merge "Merge SQ3A.220605.009" am: eb681f393e am: 9f29cec28d -s ours 
am skip reason: Merged-In I080df3547361aef1aa259dd2b3dc9bdb860a0193 with SHA-1 a2e8e22971 is already in history

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

Change-Id: I6d23de13ffe4f6804e446eac8762baeb73930888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 14:36:30 +00:00
Miguel Aranda
29267e1b30 Merge "Fix ByteBufferBulkPerfTest issues by shortening param & test names." am: 5c73e446de 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128773

Change-Id: Iaec00b4f22f9a423ab04b389c25d3b3c67e4c6a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 14:11:08 +00:00
Miguel Aranda
083f2e7266 Merge "More libcore benchmarks" am: 464ee3d1f1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2100170

Change-Id: Idba32512e197a38e0652153e658f48aa3ef6c0bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 14:10:47 +00:00
Treehugger Robot
9f29cec28d Merge "Merge SQ3A.220605.009" am: eb681f393e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128754

Change-Id: I056fda33faae8bcf0959cfc91eec884c377e1c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 14:09:47 +00:00
Miguel Aranda
5c73e446de Merge "Fix ByteBufferBulkPerfTest issues by shortening param & test names." 2022-06-20 14:05:47 +00:00
Miguel Aranda
464ee3d1f1 Merge "More libcore benchmarks" 2022-06-20 14:05:33 +00:00
Treehugger Robot
eb681f393e Merge "Merge SQ3A.220605.009" 2022-06-20 13:36:04 +00:00
Automerger Merge Worker
257dc30857 Merge "[automerger skipped] Add SDK level check to adding sandbox UIDs. am: 512a4fe715 am: 2c3b5487e9 -s ours" into tm-d1-dev-plus-aosp 2022-06-20 12:55:59 +00:00
Martijn Coenen
a8e2cbbe1e [automerger skipped] Add SDK level check to adding sandbox UIDs. am: 512a4fe715 am: 2c3b5487e9 -s ours 
am skip reason: Merged-In If453e16e680f46cf2b9eb769e5607fb5513b32ac with SHA-1 ab678b983b is already in history

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

Change-Id: If92d9e86e873590ac57c0c535dbcb31fd1c0c92f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 12:55:34 +00:00
Martijn Coenen
8b5cca8ce4 [automerger skipped] Add SDK level check to adding sandbox UIDs. am: 512a4fe715 -s ours am: dd1a592696 -s ours 
am skip reason: Merged-In If453e16e680f46cf2b9eb769e5607fb5513b32ac with SHA-1 ab678b983b is already in history

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

Change-Id: Ia4b3c57dc3588fed52263b48857be831c8129f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 12:55:30 +00:00
Martijn Coenen
2c3b5487e9 Add SDK level check to adding sandbox UIDs. am: 512a4fe715 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18992911

Change-Id: I46364ac7888505172cbfa22261ab4ed13fa8cb31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 12:38:33 +00:00
Martijn Coenen
dd1a592696 [automerger skipped] Add SDK level check to adding sandbox UIDs. am: 512a4fe715 -s ours 
am skip reason: Merged-In If453e16e680f46cf2b9eb769e5607fb5513b32ac with SHA-1 ab678b983b is already in history

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

Change-Id: Iaa1567a052ba30c341576541fcaffcb1f8132687
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 12:37:02 +00:00
Elis Elliott
d38bf5adac Update the docs for the provisioning extra AllowOffline. 
update to reflect the new usage of the extra in forcing platform side
provisioning.

Bug: 236597525

Test: n/a
Change-Id: Ie98e9aaa790d1c0bd4b2d5e2b85a81bd8e3c92e3
 2022-06-20 12:34:11 +00:00
Martijn Coenen
512a4fe715 Add SDK level check to adding sandbox UIDs. 
ConnectivityServiceTest builds against the latest Vpn framework code,
but when run on an older base image (eg 'S'), said framework code might
run into runtime errors calling new APIs. Until the test is decoupled,
do the SDK level check here.

Bug: 230548427
Bug: 232420362
Test: Build
Change-Id: If453e16e680f46cf2b9eb769e5607fb5513b32ac
(cherry picked from commit ab678b983b)
Merged-In: If453e16e680f46cf2b9eb769e5607fb5513b32ac
 2022-06-20 10:27:07 +00:00
Vadim Caen
a2e45f1ed1 Prevent callback registration when back flag is disabled 
When the enableOnBackInvokedCallback is set to false (or not set),
registering an OnBackInvokedCallback should be a no-op to avoid
overriding the default compat callback.

Test: Manual testing registering a callback on an app with the flag
disabled and doing a back gesture. Currently we don't have test
executing a back gesture so automated tests are not possible

Bug: 235206960

Change-Id: I54d843f11130a78ed5a68cbe4722e601a2086ee1
Merged-In: I54d843f11130a78ed5a68cbe4722e601a2086ee1
(cherry picked from commit aa48dc3c2d)
 2022-06-20 11:40:18 +02:00
TreeHugger Robot
55fa77ffdf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 7b16d91315 -s ours am: 41bcf6803e -s ours am: 06667bb91b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idbbe987e038e80a6c42351001f5d3d195778ea8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:51:08 +00:00