Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
765,117 Commits 3 Branches 0 Tags
3ff8feac5a963ca84f1cb4426567f6c235656aaa
Commit Graph

765117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Louis Chang
3ff8feac5a Merge "Do nothing when a finishing Activity configuration changed" into tm-dev am: 725d1534ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19008927

Change-Id: I8d671b66969befd1ce37ad4e8b9984603213e805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 00:49:18 +00:00
Louis Chang
725d1534ad Merge "Do nothing when a finishing Activity configuration changed" into tm-dev 2022-06-23 00:30:19 +00:00
Shaowei Shen
2ff2c21158 Merge "[Output Switcher] Sets TemporaryAllowList when transfer from local to remote (or oppsite way)" into tm-dev am: 3a4731d949 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18156225

Change-Id: I0d19de0171dbe78d07716d26d8110b08716895da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 00:16:30 +00:00
Shaowei Shen
3a4731d949 Merge "[Output Switcher] Sets TemporaryAllowList when transfer from local to remote (or oppsite way)" into tm-dev 2022-06-22 23:53:24 +00:00
Issei Suzuki
96a6b4aa02 Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev am: 6eaacb50f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918937

Change-Id: Ie992b3089356f239624af71496b4670914ac9e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 21:37:58 +00:00
Issei Suzuki
6eaacb50f2 Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev 2022-06-22 21:18:21 +00:00
Oriol Prieto Gascó
14d022ad70 Merge "Use com.android.bluetooth as the bluetooth stack APK" into tm-dev am: 75c201f935 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18977517

Change-Id: Iabf3f5798bc5b3d66fddd7ec48fe53e18a9b67a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 17:45:16 +00:00
Oriol Prieto Gascó
75c201f935 Merge "Use com.android.bluetooth as the bluetooth stack APK" into tm-dev 2022-06-22 17:18:46 +00:00
shaoweishen
547f613a80 [Output Switcher] Sets TemporaryAllowList when transfer from local to 
remote (or oppsite way)

app will create new UMO when transfer between local and remote,
and it will produce Exception if app is background, so set it
to TemporaryAllowList before start transferring.

Bug: 235339353
Test: atest atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest MediaOutputGroupAdapterTest MediaOutputGroupDialogTest
Change-Id: I32a823919b48fd784d354858c7e3b1070a723e28
Merged-In: I32a823919b48fd784d354858c7e3b1070a723e28
 2022-06-22 15:55:02 +00:00
Shaowei Shen
84612594e2 Merge "[Output Switcher] Use Thread-safe list to store mediaDevices in MediaManager" into tm-dev am: 82c3268cbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18911999

Change-Id: Iaf65dfd933ddc922a4a8174cd31a6c6825472691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 08:30:21 +00:00
Shaowei Shen
82c3268cbe Merge "[Output Switcher] Use Thread-safe list to store mediaDevices in MediaManager" into tm-dev 2022-06-22 08:01:56 +00:00
Andrii Kulian
253f3e886e Merge "Check Task windowing mode when reporting display features" into tm-dev am: cfe0279f69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18972307

Change-Id: I0d627b6276108f6801ce36aee60a1820844f879c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 05:39:42 +00:00
Andrii Kulian
cfe0279f69 Merge "Check Task windowing mode when reporting display features" into tm-dev 2022-06-22 05:19:15 +00:00
shaoweishen
84d0224973 [Output Switcher] Use Thread-safe list to store mediaDevices in 
MediaManager

Test: build pass
Bug: 235183673
Change-Id: Ic00c1085f3ddc3c9bf68815a4ef96a5f1391556c
 2022-06-22 01:11:57 +00:00
Daniel (Ying Wai) Fan
e4b833b1a4 Merge "Revert "[Media TTT] Turn the TTT flag off for Android T."" into tm-dev am: fe44acf0d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19014905

Change-Id: Ib242788c4b29a071c487fb629e50632127ee5db5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 00:10:55 +00:00
Daniel (Ying Wai) Fan
fe44acf0d7 Merge "Revert "[Media TTT] Turn the TTT flag off for Android T."" into tm-dev 2022-06-21 23:52:35 +00:00
Daniel (Ying Wai) Fan
e4e4056d5a Revert "[Media TTT] Turn the TTT flag off for Android T." 
This reverts commit 4da2f8be76.

Reason for revert: The CL is causing test breakage b/236749332.

Change-Id: Iaf922eaa612f6f7d8bfb32dd3575192af039c8cb
Bug: 236749332
 2022-06-21 22:37:45 +00:00
Caitlin Cassidy
7dc5c76eab Merge "[Media TTT] Turn the TTT flag off for Android T." into tm-dev am: 3b84c43c1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18934573

Change-Id: I5fcb9c6147ae5b6f63db130a108a867983d2963e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 18:43:11 +00:00
Caitlin Cassidy
3b84c43c1e Merge "[Media TTT] Turn the TTT flag off for Android T." into tm-dev 2022-06-21 18:40:34 +00:00
Shan Huang
a79aed78d5 Merge "Pass the values of the MotionEvent instead of the event instance itself to BackAnimation." into tm-dev am: 1deb1af4a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18963576

Change-Id: I24f8b034e3bfdc15493c8f2a2716985fddc4deab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 18:34:51 +00:00
Issei Suzuki
6920cf5546 Ignore overriding pending animaiton for unlock transition. 
System app can request to override app transition animation using
the following hidden APIs.

- IWindowManager#overridePendingAppTransitionRemote
- Activity#registerRemoteAnimations
- IActivityTaskManager#registerRemoteAnimationsForDisplay

We usually give the lowest priority for the overrides registered by
the last API, since it defines default transition animaiton for a given
transition type and others are used to overide more specific cases.

However remote animation for unlock transition is also used to sync
keyguard status between server_process and system ui, even system app
must not override it.

Bug: 231556392
Test: manual
  1. Press Power button to display the lock screen.
  2. Press Power button and the volume down button at the same time to
     take a screenshot.
  3. Tap the screenshot preview that appears in the lower left corner
     of the screen.
  4. Execute Fingerprint authentication to unlock the screen.
Change-Id: I16593c1aa7e7799e355aafbe47832e5c3b23c0cc
 2022-06-21 18:24:07 +00:00
Shan Huang
1deb1af4a7 Merge "Pass the values of the MotionEvent instead of the event instance itself to BackAnimation." into tm-dev 2022-06-21 18:13:38 +00:00
TreeHugger Robot
f6c9d9d376 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 77f103bc32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05fe706949b4967447bdf00e1e9618ca65566d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:23:59 +00:00
Bill Yi
e9d06aba26 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 948e3c4e24 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5dad3baf3ec2160baf3678dcff6b88142c737b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:23:50 +00:00
TreeHugger Robot
9207b9dd83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 65ded46c54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2fdfe82d9ba382504a98ace0ae67e7f435dc4a0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:23:38 +00:00
Bill Yi
110aa26852 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2685032b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9a143f1163f5e634bbe396b24d67eee8830205c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:23:24 +00:00
TreeHugger Robot
77f103bc32 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-21 16:17:20 +00:00
TreeHugger Robot
65ded46c54 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-21 16:17:20 +00:00
Ben Miles
be4364610b 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: I0fb498af70f3d5858d9bf0c2b54d39c5c513189c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:13:32 +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
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
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
Louis Chang
b6297b6a46 Do nothing when a finishing Activity configuration changed 
Primary Activity and secondary Activity were both finished
while starting another Activity with FLAG_ACTIVITY_CLEAR_TASK
flag. The secondary container was then removed and the primary
container was resized to fullscreen while the organizer gets
the secondary TaskFragment info-changed event. And the primary
container was removed by primary TaskFragment info-changed event
afterward.

Since the primary Activity was resized before completely being
destroyed. The organizer got an onActivityConfigurationChanged c
allback and resulted in another placeholder activity being launched.

Bug: 236272623
Test: making Duo calls
Change-Id: I851828f739a4937725510d99cbdfae9ed212a023
 2022-06-21 09:19:05 +00:00
Bill Yi
d2685032b2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idd7b2a6aca4fa6a96e30a0c1c8fbcad28e987cd5
 2022-06-21 01:47:44 -07:00
Bill Yi
948e3c4e24 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3568d46d9bbe92ad76f7f0d2d91b68706b9f51d2
 2022-06-20 23:58:14 -07: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
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
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
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
bd44dfb171 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 7b16d91315 -s ours am: 41bcf6803e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifcd1848c7f9519b6b77de5bb6fe72f0c7df7c43a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:24:30 +00:00
Bill Yi
5288d56c1e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89bcac62e3 -s ours am: df661f4585 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I171940bcef8f49b12bc91f337a4b9b1568c55542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:24:29 +00:00
TreeHugger Robot
7f18a7894b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 28f8641d3d -s ours am: 45e4bc63da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76e5341ec9694cf839d3f0ddc5c89c36e516bcc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:24:28 +00:00
Bill Yi
b6540fcda7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a0cf385810 -s ours am: c20acb95e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6112345749a1f0fc191d88ebe64b486e00125111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:24:26 +00:00
TreeHugger Robot
08b9beb636 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a41b724a95 -s ours am: b8f343920e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I78d8bd42d838a0b0cef0c94d577261eed67ce7f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:24:24 +00:00
Bill Yi
206a00f39e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91b202fdeb -s ours am: 58782460a4 -s ours 
am skip reason: subject contains skip directive

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

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