Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
757,380 Commits 3 Branches 0 Tags
027cdaa5dcd4aa40e0828fe82dd57ee9c548fa92
Commit Graph

757380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
027cdaa5dc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8055f832ca -s ours am: e4c8eff63c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I415a9a8b9c5242d65887436d38e5fa8c12d9770b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:34:11 +00:00
Bill Yi
fb99f0b6f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3b681d7c20 -s ours am: 85af26ac68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e4c89a47fe6523965c7ee65e8a1416dec3dfc13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:33:49 +00:00
Automerger Merge Worker
6397b1e3b5 Merge changes from topic "am-6edfa0d45b204ee2885798a044e33cd8" into tm-dev 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d0e22717e3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff24f43363 -s ours
 2022-04-14 15:33:46 +00:00
Bill Yi
268f59340a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbafdfce8d -s ours am: 539a1a6c1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6acd6e82eb4b1924cd0544f4680df4507ee06ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:33:32 +00:00
Bill Yi
6b2627ff3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d0e22717e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifcf397a10b17c052c40e837eaf143745131193cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:33:25 +00:00
Bill Yi
990354e143 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff24f43363 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iedce5ce61b557759719cc131fb1e0e7feec9d6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:33:14 +00:00
Bill Yi
e4c8eff63c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8055f832ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c12945518fe6cac980b25273e47d303f8d2d5ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:32:44 +00:00
Bill Yi
6427fd0943 Merge changes from topic "presubmit-am-6d026c0057d6491db92643d150b2f314" into sc-v2-dev-plus-aosp am: 9d9c759be0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734713

Change-Id: I77bbcb0ee93802449f4645a451df02c8ab3d1fce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:32:42 +00:00
Bill Yi
cba570877f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 758f1d490e am: 4a293844a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5ae6e6b4afa08529374395b000d060548294d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:32:26 +00:00
Bill Yi
85af26ac68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3b681d7c20 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e1021385ef261f7fa1db7e90fe75fe08e0ea863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:32:04 +00:00
Bill Yi
539a1a6c1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbafdfce8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79c75383442c68aaaa55e743cfbe5dbaaa4ae9d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:31:43 +00:00
Bill Yi
9d9c759be0 Merge changes from topic "presubmit-am-6d026c0057d6491db92643d150b2f314" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 758f1d490e
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-14 15:13:25 +00:00
Bill Yi
3b681d7c20 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-14 15:13:25 +00:00
Bill Yi
294898b5ff Merge changes from topic "presubmit-am-11ef4e3648214d1aabef3b795a4830d6" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 95b6f5ff0f
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-14 15:13:12 +00:00
Bill Yi
2be0594a93 Merge changes from topic "presubmit-am-fc5cbd46af764774b734634f6be03d6b" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a488dd99ac
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-14 15:12:55 +00:00
Bill Yi
d0e22717e3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-14 15:12:29 +00:00
Bill Yi
40f6441d27 Merge changes from topic "presubmit-am-65f63803c7ea434591f05342f4d5cc98" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 87a366b763
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-14 15:11:09 +00:00
Beth Thibodeau
f5a79fb799 Merge "Don't bring up keyguard when activity can show over lockscreen" into tm-dev 2022-04-14 15:11:03 +00:00
Bill Yi
1ebccbeb6d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-14 15:05:09 +00:00
Bill Yi
1a8af22e63 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-14 15:04:49 +00:00
TreeHugger Robot
121a784a3c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-14 15:02:00 +00:00
Tsung-Mao Fang
b42867b879 Merge "Use androidx.window prebuilt." into tm-dev 2022-04-14 14:40:21 +00:00
Michał Brzeziński
adc90ad56c Merge "Quick fix for notification scrim showing when swiping up the bouncer" into tm-dev 2022-04-14 14:37:12 +00:00
Chavi Weingarten
700cdec45b Merge "Set mSyncBuffer to true when VRI did not initiate the sync request" into tm-dev 2022-04-14 14:19:43 +00:00
Victor Truong
ad97faab28 Merge "Resize dream clock to match UX specs." into tm-dev 2022-04-14 13:56:42 +00:00
TreeHugger Robot
63104b024e Merge "Fix media_session shell commands" into tm-dev 2022-04-14 12:56:48 +00:00
Justin Weir
4682c6576c Merge changes from topic "b221419865" into tm-dev 
* changes:
  Change Logcat to only log in background thread in debug mode
  Move logging to background thread in LogBuffer
 2022-04-14 11:34:59 +00:00
Justin Weir
123c1b0954 Merge changes from topic "b224749799" into tm-dev 
* changes:
  Allow null prev/next buttons to be INVISIBLE instead of GONE
  Remove logging and nullable return type from getCustomAction
 2022-04-14 11:34:00 +00:00
Santiago Seifert
12b2d2c768 Fix media_session shell commands 
Bug: 227109905
Test: Manually tested using AndroidX Media session demo app.
Change-Id: Ie3cee37689ca2be30c522c1439afd5e6dde374e1
Merged-In: Ie3cee37689ca2be30c522c1439afd5e6dde374e1
(cherry picked from commit 5f18e7a7fc)
 2022-04-14 11:04:44 +00:00
Pavel Grafov
c291627ea9 Merge "Remove fossilized upgrade code." into tm-dev 2022-04-14 11:02:12 +00:00
Mark Renouf
09f39ec2fd Merge "Explicitly allow access to share targets by package" into tm-dev 2022-04-14 10:35:17 +00:00
TreeHugger Robot
ca1f7d88d4 Merge "QSFragment: fix NPE in setOverScrollAmount" into tm-dev 2022-04-14 10:28:01 +00:00
Chris Li
88671a050f Merge "Notify organizer when the last activity in TaskFragment enter PiP" into tm-dev 2022-04-14 10:22:10 +00:00
Diego Vela
8e00e4868b Use androidx.window prebuilt. 
Use androidx.window prebuilt for consistency.

Bug: 223114509
Test: manual
Change-Id: If178cd0f9202ec2d9da2fc75f2edb12c47e61dac
 2022-04-14 09:56:19 +00:00
Tony Huang
96770f2561 Merge "Add error handling for start task and intent" into tm-dev 2022-04-14 09:11:21 +00:00
Neil Fuller
d718e76f47 Merge "Fix metrics test flakiness" into tm-dev 2022-04-14 08:54:13 +00:00
Michal Brzezinski
cb612eeb77 Quick fix for notification scrim showing when swiping up the bouncer 
This fix is disabling activating mQsExpandImmediate on lockscreen. This might be even long term fix as this callback is not activated on lockscreen when we actually want it to anyway - so it works on lockscreen but only when it's not desired.

Fixes: 228607886
Test: manual
Change-Id: Iaeee17391894f4e3a0bd617ca6b8133f0b9718e4
 2022-04-14 09:53:01 +01:00
Galia Peycheva
47a0ff16f5 Merge "Fix WCT.setBounds not being picked up by Task" into tm-dev 2022-04-14 07:40:27 +00:00
Galia Peycheva
939b27cb50 Fix WCT.setBounds not being picked up by Task 
Bug: 228939973
Test: start resizable activity while there is an expanded pip
Change-Id: I814369a0d5da97e3a75efb47376c964549f8a064
 2022-04-14 07:40:06 +00:00
Louis Chang
df3e2162b0 Merge "Migrate task intent/info to new task only if source task is empty" into tm-dev 2022-04-14 06:56:30 +00:00
Tony Huang
4ae839860f Add error handling for start task and intent 
If user start task and intent with same app but not support
multi-instance, in this case it will only start one side split and
the other one show as black screen.
We should avoid such status and do some error handling, this patch
prevent it by exiting split immediately and expand the that app as
full screen.

Fix: 224888879
Test: manual
Test: pass existing tests
Change-Id: I827debb01f3a2fc8f04f4b1931084f2fa475f8a6
 2022-04-14 14:40:13 +08:00
Wei Sheng Shih
fe1b41da4f Merge "Skip splash screen exit animation if screen isn't on." into tm-dev 2022-04-14 06:29:36 +00:00
Yurii Zubrytskyi
ec8a93368c Merge changes from topic "Tiramisu-SDK-Finalization" into tm-dev 
* changes:
  frameworks/base - Tiramisu is now 33 #3 - resources
  frameworks/base - Tiramisu is now 33 #2
 2022-04-14 06:21:09 +00:00
Yi-yo Chiang
ddd9dc84b8 Merge "dynsystem: Fix memory leak" am: a227192105 am: c066ef1fef am: a26312c265 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033046

Change-Id: I6100872de86dd7bec3a4cdfa9bcd030f74c254f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 05:24:27 +00:00
TreeHugger Robot
de71ca35f9 Merge "Move the logic of deciding what all insets are controllable to InsetsPolicy." into tm-dev 2022-04-14 04:57:51 +00:00
Yi-yo Chiang
a26312c265 Merge "dynsystem: Fix memory leak" am: a227192105 am: c066ef1fef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033046

Change-Id: I633379239b02140c7475a47567476c5713da941f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 04:55:58 +00:00
Yi-yo Chiang
c066ef1fef Merge "dynsystem: Fix memory leak" am: a227192105 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033046

Change-Id: I1bde367ff181ed1c3cca018006fa3e6847a7f464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 04:33:17 +00:00
Kweku Adams
e491010558 Merge "Fix rescheduling of jobs with large periods." into tm-dev 2022-04-14 03:46:55 +00:00
Kweku Adams
6aabd50f5c Fix rescheduling of jobs with large periods. 
We were accidentally skipping execution windows of jobs with large
periods if the job was deferred by 30+ minutes, even if the next window
would have been days later. For example, if a periodic job with a period of
7 days and flex of 1 day was scheduled at t0, its original window would
be [t6, t7]. If it ended up running at t7+35minutes, JS would reschedule
the next iteration for [t20, t21], even though it would be safe to
schedule it for [t13, t14]. This change fixes the rescheduling so we
don't skip the next window unless we are actually close to the start of
the next window.

Bug: 229135653
Test: atest FrameworksMockingServicesTests:JobSchedulerServiceTest
Change-Id: I068628e96529b834c5b68e9e25fa130f40f0eef9
 2022-04-14 03:45:25 +00:00
Yi-yo Chiang
a227192105 Merge "dynsystem: Fix memory leak" 2022-04-14 03:38:55 +00:00