Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
769,271 Commits 3 Branches 0 Tags
d9853e8a175232fbe9876109df759559047553df
Commit Graph

769271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d9853e8a17 Merge "Revert "Revert "[Media TTT] Turn the TTT flag off for Android T.""" into tm-dev am: f15eaff65e am: d0b442cf02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19038846

Change-Id: Id8cc7964b2468187393163425ce1a0a42cfab623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 17:13:26 +00:00
Evan Rosky
30c78f9d45 Merge "Attemp to fix Launcher stay invisible after keyguard unlock." into tm-qpr-dev 2022-06-23 17:08:33 +00:00
Evan Rosky
dfbcd379bb Merge "End transitions when receiving merge request" into tm-qpr-dev 2022-06-23 16:59:27 +00:00
TreeHugger Robot
d0b442cf02 Merge "Revert "Revert "[Media TTT] Turn the TTT flag off for Android T.""" into tm-dev am: f15eaff65e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19038846

Change-Id: I7acfd308a74c1fd93048ba73f87c77b10b7edf16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 16:47:18 +00:00
Xiaowen Lei
1e43c3b429 Merge "Move setIsDreaming(..); to be right after plugin.getView(parent);." into tm-qpr-dev 2022-06-23 16:41:09 +00:00
TreeHugger Robot
f15eaff65e Merge "Revert "Revert "[Media TTT] Turn the TTT flag off for Android T.""" into tm-dev 2022-06-23 16:25:36 +00:00
Xiaowen Lei
86fe9ea923 Merge "Remove SmartSpaceComplication when the SmartspaceTargetListener is removed." into tm-qpr-dev 2022-06-23 16:23:06 +00:00
Bryce Lee
38df5710bc Merge "Do not filter MediaDreamComplication." into tm-qpr-dev 2022-06-23 15:28:50 +00:00
TreeHugger Robot
b22b06729b Merge "Prevent re-entrant calls to onPause" into tm-dev am: d39f0f7cfd am: afc8080c60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034153

Change-Id: I4e46ac00adc83f343d7d65e31ae35d4f5ecb6c85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 15:12:55 +00:00
Jiakai Zhang
186fe15c11 Merge "Fix a logic error in getDexoptNeeded." into tm-dev am: e8a0838648 am: 66439a2adb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19032749

Change-Id: I0fefdeb0178bbb1aa0ba41a8fb2f79d79864589e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 15:12:46 +00:00
TreeHugger Robot
afc8080c60 Merge "Prevent re-entrant calls to onPause" into tm-dev am: d39f0f7cfd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034153

Change-Id: Ia55770dca6c1661016e885c01caddaab832bd647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 15:12:45 +00:00
TreeHugger Robot
d39f0f7cfd Merge "Prevent re-entrant calls to onPause" into tm-dev 2022-06-23 14:54:51 +00:00
Jiakai Zhang
66439a2adb Merge "Fix a logic error in getDexoptNeeded." into tm-dev am: e8a0838648 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19032749

Change-Id: I0e3639db82cb27dc58a4322c25bb85a808a80663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 14:47:28 +00:00
Jiakai Zhang
e8a0838648 Merge "Fix a logic error in getDexoptNeeded." into tm-dev 2022-06-23 14:24:00 +00:00
TreeHugger Robot
749710e784 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 493ad917f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ecf2c6d3ef81a7fd003f2359df28c9bd7d64284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:46:22 +00:00
Bill Yi
e615ddb03b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a0159f6efe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d2ccf21531f425dda99e29f3df2d0788bb11191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:46:16 +00:00
TreeHugger Robot
c348cb6ca4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: b280afc6f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia44841e2975f2678439d6cfcc351e7f0f0ba325d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:46:05 +00:00
Bill Yi
1e34f76a68 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a77bfe0962 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ad4790a1a75c41fa86aa860ede87f05d5863f87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:45:57 +00:00
TreeHugger Robot
493ad917f8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-23 11:24:26 +00:00
TreeHugger Robot
b280afc6f8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-23 11:24:26 +00:00
Jeff DeCew
63db155f56 Merge changes I2cc194ad,I1ed99b7f,I404a307a into tm-qpr-dev 
* changes:
  Reinflate active notifications when SHOW_NOTIFICATION_SNOOZE setting changes.
  New Pipeline: Move SectionClassifier to the provider package
  New Pipeline: Move SectionHeaderVisibilityProvider to the provider package
 2022-06-23 11:17:49 +00:00
TreeHugger Robot
a9abf3ce77 Merge "Change Bluetooth apex mountpoint" into tm-dev am: 7a1c701712 am: 183bba2187 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19038084

Change-Id: I116254e4e466c2b24ab5301bd5ce115582aa3725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 10:51:30 +00:00
TreeHugger Robot
183bba2187 Merge "Change Bluetooth apex mountpoint" into tm-dev am: 7a1c701712 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19038084

Change-Id: Ieb59b21f93307064c96e6c1a22443614f38f715a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 10:35:10 +00:00
TreeHugger Robot
7a1c701712 Merge "Change Bluetooth apex mountpoint" into tm-dev 2022-06-23 10:21:35 +00:00
TreeHugger Robot
630304370c Merge "Immediately notify VM of TOP process state" into tm-dev am: 37e033dbc3 am: a4355499cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19024046

Change-Id: Ife2dfca42943ff2c06f7095113b16128b675f6f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 07:17:26 +00:00
TreeHugger Robot
a4355499cb Merge "Immediately notify VM of TOP process state" into tm-dev am: 37e033dbc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19024046

Change-Id: I1324664c559bd17a359db2e08860273e8a315280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 06:52:41 +00:00
TreeHugger Robot
37e033dbc3 Merge "Immediately notify VM of TOP process state" into tm-dev 2022-06-23 06:34:41 +00:00
Tiger Huang
228988d5e7 Merge "Send the attached frame to the client" into tm-qpr-dev 2022-06-23 06:11:07 +00:00
Xiaowen Lei
10ef287c2f Move setIsDreaming(..); to be right after plugin.getView(parent);. 
This is necessary because registerDataProvider(plugin) could already be
logging events. The logged surface is 2 (Keyguard) without the
`setIsDreaming(true)`.

Bug: 227613246
Bug: 231251252
Test: on device via `adb logcat | grep SMARTSPACE_CARD_RECEIVED`
Change-Id: Id792bde00b66fd51b6a8606f7f6480718f64a22a
 2022-06-23 05:41:06 +00:00
TreeHugger Robot
cb570a347e Merge "Fix bouncer scrim animation on split shade" into tm-qpr-dev 2022-06-23 01:51:30 +00:00
Louis Chang
966a4e4e81 Merge "Do nothing when a finishing Activity configuration changed" into tm-dev am: 725d1534ad am: 3ff8feac5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19008927

Change-Id: I88bad53e137f2fe321928ba8b833f0f8b2ecea22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 01:07:10 +00:00
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
Shaowei Shen
1e9a1d54b5 [automerger skipped] Merge "[Output Switcher] Sets TemporaryAllowList when transfer from local to remote (or oppsite way)" into tm-dev am: 3a4731d949 am: 2ff2c21158 -s ours 
am skip reason: Merged-In I32a823919b48fd784d354858c7e3b1070a723e28 with SHA-1 ab7e8ff236 is already in history

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

Change-Id: I38f6067cb7e75e9c994012f5473cf8b5eb9b533c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 00:41:10 +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
23d883bc4c Merge "[Output Switcher] Sets TemporaryAllowList when transfer from local to remote (or oppsite way)" into tm-qpr-dev 2022-06-22 23:53:24 +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
Bryce Lee
f303903a45 Do not filter MediaDreamComplication. 
This changelist removes the type filter for MediaDreamComplication,
allowing it to show over any dream.

Test: atest DreamOverlayStateControllerTest#testComplicationWithNoTypeNotFiltered
Fixes: 236080038
Change-Id: Idbfbd59b1277705a1e67aeff900d860681ca53cb
 2022-06-22 16:11:28 -07:00
Issei Suzuki
6ac7eb3669 Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev am: 6eaacb50f2 am: 96a6b4aa02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918937

Change-Id: I07f653a44483d343397f086e0da603a70dc7ba6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 21:54:54 +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
Caitlin Cassidy
9b0f383819 Revert "Revert "[Media TTT] Turn the TTT flag off for Android T."" 
This reverts commit e4e4056d5a.

Reason for revert: CTS tests are fixed in linked topic.

Change-Id: Iefed77f0eb679e41a37d11d0c337dc5dd1c9a1e2
 2022-06-22 20:36:43 +00:00
William Escande
7b012e937e Change Bluetooth apex mountpoint 
Apex name has been changed to com.android.btservices
Changing mount point accordingly
Bug: 235892590
Test: Flash / boot bt / look logs & pair a device

Change-Id: I8cff5f6449ee19466b3df571a40e062964a9e46c
 2022-06-22 13:19:14 -07:00
Oriol Prieto Gascó
bbb13e732f Merge "Use com.android.bluetooth as the bluetooth stack APK" into tm-dev am: 75c201f935 am: 14d022ad70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18977517

Change-Id: I2f02ac7c84214dd0785ca9723f435c7f1fc3348b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 18:12:28 +00:00
Matt Pietal
6c1d067e9a Prevent re-entrant calls to onPause 
This can occur when launching an occluding activity where the user has
user the password bouncer. The IME animation begins, but is then
canceled in favor of the activity being launched, which begins a chain
of events that start a second call to pause.

Fixes: 236348317
Test: manual (follow steps in bug to launch occluding activity)
Change-Id: I158504872d41c96f1f6f27cab481945cd11c27e0
 2022-06-22 17:46:00 +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
Hongwei Wang
3d29930505 Merge "Get PiP state from Shell in EdgeBackGestureHandler" into tm-qpr-dev 2022-06-22 16:56:57 +00:00
Michał Brzeziński
3a98dbf919 Merge "1/2 Making bouncer shift on double tap when user chooser is visible" into tm-qpr-dev 2022-06-22 16:56:06 +00:00
shaoweishen
ab7e8ff236 [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
 2022-06-22 15:55:35 +00:00