Commit Graph

751711 Commits

Author SHA1 Message Date
TreeHugger Robot
6121199504 Merge "Add getAttributionSource function to mocked context" into tm-dev am: fd8fadf0db am: dd913725f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17035951

Change-Id: I5e7742b731984fe4fc811146d872b1672e088c01
2022-03-02 03:10:43 +00:00
Alex Buynytskyy
e788979b45 Merge "Reduce lock contention." into tm-dev am: 4b7f97e065 am: f28b1d4a0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16987851

Change-Id: I502df81225e04a52be209a89ba54d42451a40cee
2022-03-02 03:09:41 +00:00
Alex Buynytskyy
575d9eeafe Merge "Better error message for unexpected exceptions." into tm-dev am: 645d078e1f am: 00325a9c8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16982986

Change-Id: I11c81b2c6491e98d9f1f6ae073a77c837f1dcd38
2022-03-02 03:09:09 +00:00
Alex Buynytskyy
73ca99c03a Merge "Defer the app data fixup until we are done with app data clearing above." into tm-dev am: 81e3ad3f8f am: 35034af700
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16982409

Change-Id: I576ec70c4d2018334034bd3cda32725b5cf74469
2022-03-02 03:08:42 +00:00
TreeHugger Robot
1918afb90b Merge "Remove double-locking from PowerManagerService.onBootPhase" into tm-dev am: 1d609047f8 am: 3adb6db87f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047524

Change-Id: Ife31071032abd62005cc45afd884425d55ff974f
2022-03-02 03:07:41 +00:00
TreeHugger Robot
7fbd4b6a30 Merge "Add getAttributionSource function to mocked context" into tm-dev am: fd8fadf0db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17035951

Change-Id: I8f0e035abe5d69b80dc79abe51e351be79555f48
2022-03-02 02:50:38 +00:00
Alex Buynytskyy
85e0e11255 Merge "Reduce lock contention." into tm-dev am: 4b7f97e065
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16987851

Change-Id: Ice02d214868ba547655ce3c8ba5cdcd7e58a881a
2022-03-02 02:49:39 +00:00
Alex Buynytskyy
24cbb5614b Merge "Better error message for unexpected exceptions." into tm-dev am: 645d078e1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16982986

Change-Id: I70a71c1a4ac6ad8e033f17803256fa107a0f155a
2022-03-02 02:48:59 +00:00
Alex Buynytskyy
1e153a18d5 Merge "Defer the app data fixup until we are done with app data clearing above." into tm-dev am: 81e3ad3f8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16982409

Change-Id: Iacf42807eb263dda9f21e83c838c3d046769ab2d
2022-03-02 02:48:24 +00:00
TreeHugger Robot
dd913725f7 Merge "Add getAttributionSource function to mocked context" into tm-dev am: fd8fadf0db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17035951

Change-Id: I6b6a96532adb36bddacf47d1d4d8a7971daf24d2
2022-03-02 02:47:59 +00:00
Alex Buynytskyy
f28b1d4a0a Merge "Reduce lock contention." into tm-dev am: 4b7f97e065
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16987851

Change-Id: If0c7f7af24f6cbe4fb885abd5de61aab117ad9a1
2022-03-02 02:47:35 +00:00
Alex Buynytskyy
00325a9c8d Merge "Better error message for unexpected exceptions." into tm-dev am: 645d078e1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16982986

Change-Id: I2ca0a66524aba1580e5c93574d97430456f8a86a
2022-03-02 02:47:26 +00:00
Alex Buynytskyy
35034af700 Merge "Defer the app data fixup until we are done with app data clearing above." into tm-dev am: 81e3ad3f8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16982409

Change-Id: Idc3b112499edde5057e52fc23ea5538b75792b72
2022-03-02 02:47:18 +00:00
TreeHugger Robot
0956f4f9be Merge "Remove double-locking from PowerManagerService.onBootPhase" into tm-dev am: 1d609047f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047524

Change-Id: I0ba6af97b0989b8681b3980e477797cb31cd0ad0
2022-03-02 02:46:18 +00:00
TreeHugger Robot
fd8fadf0db Merge "Add getAttributionSource function to mocked context" into tm-dev 2022-03-02 02:45:12 +00:00
TreeHugger Robot
3adb6db87f Merge "Remove double-locking from PowerManagerService.onBootPhase" into tm-dev am: 1d609047f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047524

Change-Id: I1e0c6eecdc095bc611fd7674d9f77fe6dffa5d58
2022-03-02 02:45:10 +00:00
Alex Buynytskyy
4b7f97e065 Merge "Reduce lock contention." into tm-dev 2022-03-02 02:31:06 +00:00
Alex Buynytskyy
645d078e1f Merge "Better error message for unexpected exceptions." into tm-dev 2022-03-02 02:31:06 +00:00
Alex Buynytskyy
81e3ad3f8f Merge "Defer the app data fixup until we are done with app data clearing above." into tm-dev 2022-03-02 02:31:06 +00:00
TreeHugger Robot
e002b6b63d Merge "remove redundant share intent for Wear bug report" 2022-03-02 02:26:26 +00:00
TreeHugger Robot
1d609047f8 Merge "Remove double-locking from PowerManagerService.onBootPhase" into tm-dev 2022-03-02 02:26:09 +00:00
shaoweishen
01049ce83c [Output Swithcer] Apply device volume in group instead of session volume am: cab5bb217d am: 3d992011cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17035626

Change-Id: Ibd68f9f17357ce9e47ef6754cc1215232c8d7909
2022-03-02 02:17:59 +00:00
Shaowei Shen
68fd66c6fd [automerger skipped] Merge "[Output Switcher] Fix recyclerview flickering" into tm-dev am: fedcf34ff8 am: 1aa13a1140 -s ours
am skip reason: Merged-In I7532a54a6b0fa945a4c87a9b8abb39f51d3a9aba with SHA-1 fcf85a36c0 is already in history

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

Change-Id: I692126ddc82dc2b2bc146a7467b529ef50ec3a6a
2022-03-02 02:17:30 +00:00
Shan Huang
f8b8773970 Merge "Turn off predictive back" into tm-dev am: 455035b4bc am: 9b25e0c667
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047780

Change-Id: If877d5eeb5d29495777477e2d6f6a2b8b987420a
2022-03-02 02:16:29 +00:00
shaoweishen
8619d2fdc3 [Output Swithcer] Apply device volume in group instead of session volume am: cab5bb217d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17035626

Change-Id: I428c0fd4b65ab47d8c4ba517c10c05823a96991d
2022-03-02 02:15:50 +00:00
Automerger Merge Worker
2d6414307a Merge "Merge "Close Transactions explicitly" into tm-dev am: 6d990b1296 am: 0763d174dc" 2022-03-02 02:15:46 +00:00
Shaowei Shen
221e72718c [automerger skipped] Merge "[Output Switcher] Fix recyclerview flickering" into tm-dev am: fedcf34ff8 -s ours
am skip reason: Merged-In I7532a54a6b0fa945a4c87a9b8abb39f51d3a9aba with SHA-1 1d25d0b587 is already in history

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

Change-Id: I577a13050e032737ac6ded11ea8cb807c0621a02
2022-03-02 02:14:48 +00:00
shaoweishen
c1d1862208 [automerger skipped] [Output Switcher] Fix recyclerview flickering am: fcf85a36c0 -s ours
am skip reason: Merged-In I7532a54a6b0fa945a4c87a9b8abb39f51d3a9aba with SHA-1 1d25d0b587 is already in history

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

Change-Id: I323466178739aaf8590802b2baa2054425f91753
2022-03-02 02:14:33 +00:00
TreeHugger Robot
1a12c5d044 Merge "Close Transactions explicitly" into tm-dev am: 6d990b1296 am: 0763d174dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047740

Change-Id: I0ab438133d91ed1b7d61de6c761206a3552cb44e
2022-03-02 02:14:23 +00:00
shaoweishen
3d992011cd [Output Swithcer] Apply device volume in group instead of session volume am: cab5bb217d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17035626

Change-Id: I57621bb5e1ef46841c085ff130d503109f5fe208
2022-03-02 02:13:39 +00:00
Shaowei Shen
1aa13a1140 Merge "[Output Switcher] Fix recyclerview flickering" into tm-dev am: fedcf34ff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17040103

Change-Id: I6e5b4e0defed6921640e8dab6c49d3d9d345d325
2022-03-02 02:13:12 +00:00
shaoweishen
cab5bb217d [Output Swithcer] Apply device volume in group instead of session volume
Bug: 203073091
Test: Verified on device
Change-Id: I5bd867a5e9849a5ccee7aa268c6177f10233236e
2022-03-02 02:05:30 +00:00
Shaowei Shen
fedcf34ff8 Merge "[Output Switcher] Fix recyclerview flickering" into tm-dev 2022-03-02 02:05:15 +00:00
Shan Huang
3d93d0eec6 Merge "Turn off predictive back" into tm-dev am: 455035b4bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047780

Change-Id: I1b8edddaf9d68ed0cede0fd81fe0ccb95ebf2fc7
2022-03-02 01:52:42 +00:00
Shan Huang
9b25e0c667 Merge "Turn off predictive back" into tm-dev am: 455035b4bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047780

Change-Id: I01ed6e228588674ffa2c83cb8da1818c3bc66443
2022-03-02 01:52:17 +00:00
TreeHugger Robot
4c90a34125 Merge "Close Transactions explicitly" into tm-dev am: 6d990b1296
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047740

Change-Id: I14d40ff05c6b282129061100b8a31d45040c4fab
2022-03-02 01:51:31 +00:00
TreeHugger Robot
0763d174dc Merge "Close Transactions explicitly" into tm-dev am: 6d990b1296
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047740

Change-Id: I63c75424174c8f0af7b2d50b940bf6fad8ced0ef
2022-03-02 01:50:31 +00:00
Daniel Hsieh
546bf0adb6 Merge changes from topics "presubmit-am-8e1f6f3832184ab4980013d926d31388", "presubmit-am-a0b2814b27254513b7a62e0a1e0044ff" into tm-dev am: 6f06d92d77 am: ba43c8e002
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17010923

Change-Id: Ibc1f6610bb0ee19db483ab05f1df3cc661b0e17d
2022-03-02 01:45:57 +00:00
Adam Bookatz
06ef7bf67c Merge "UserManagerService.hasManagedProfile fix" into tm-dev am: 7be5303254 am: 1a16664683
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17012898

Change-Id: Ic5b6428193e76b7f33586bc71da4ebfb6373e7c2
2022-03-02 01:45:13 +00:00
Shan Huang
455035b4bc Merge "Turn off predictive back" into tm-dev 2022-03-02 01:44:30 +00:00
Minche Li
95c0fdbe82 Merge "Waits for windowMagnification connection set when requesting enableWindowMagnification" into tm-dev am: 4eac44bc56 am: fc850412ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16996710

Change-Id: I8bca0b93a4f498767ef0023e6184a59c010e11ba
2022-03-02 01:44:21 +00:00
Jackal Guo
01103fb1d1 [automerger skipped] Merge "Mitigate the races during installation" into tm-dev am: b4fd1c7a81 am: 23f61105b7 -s ours
am skip reason: Merged-In Ia6b32f72f3d75b8a40c42e11d21f21c459db5299 with SHA-1 65067cb36d is already in history

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

Change-Id: Icadccf20b87a76fdb2d51bcdbfffc446355d1b5c
2022-03-02 01:43:35 +00:00
TreeHugger Robot
e24a0cfe19 Merge "Fix memory flags in external services and secondary zygotes." into tm-dev am: 951aa29f72 am: a4ef8dfacf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16989014

Change-Id: I7d9b618db1464f2577594980dda7b83bedfe9e44
2022-03-02 01:42:26 +00:00
Shan Huang
ad89a82145 Turn off predictive back
Test: m -j. Test back in apps that opt-in, opt-out & sysUI
Bug: 222170518

Change-Id: I97ae7769ff2e04eb7fb39c49e025b255cdba057f
2022-03-02 01:42:11 +00:00
Colin Cross
df7420dae6 Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b92644 am: e3086a9896 am: ffa0f38936 am: 4c7fba2811 am: 86db26a61f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003053

Change-Id: I1b60496622945f905bb8c74c07118ada27fbb6ae
2022-03-02 01:40:51 +00:00
TreeHugger Robot
6d990b1296 Merge "Close Transactions explicitly" into tm-dev 2022-03-02 01:40:39 +00:00
Binh Nguyen
44f9c0f24f Merge "Register AdServices to SystemServiceRegistry" into tm-dev am: cdda832572 am: 05df4ed425
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17033848

Change-Id: I1be23fee950a4faf54089c5e6e674743ec00cb71
2022-03-02 01:29:59 +00:00
Daniel Hsieh
ba43c8e002 Merge changes from topics "presubmit-am-8e1f6f3832184ab4980013d926d31388", "presubmit-am-a0b2814b27254513b7a62e0a1e0044ff" into tm-dev am: 6f06d92d77
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17010923

Change-Id: Ibc9e16b9d3e839a39c37a153391fb0e2c3a888dd
2022-03-02 01:23:00 +00:00
Adam Bookatz
1a16664683 Merge "UserManagerService.hasManagedProfile fix" into tm-dev am: 7be5303254
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17012898

Change-Id: I2897d518eda117b2a04fc46643af56ee7f273062
2022-03-02 01:22:39 +00:00
Daniel Hsieh
711ba689bb Merge changes from topics "presubmit-am-8e1f6f3832184ab4980013d926d31388", "presubmit-am-a0b2814b27254513b7a62e0a1e0044ff" into tm-dev am: 6f06d92d77
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17010923

Change-Id: Id2f1e796c03fc90f14c5e2149fd477f92ad33d4d
2022-03-02 01:22:26 +00:00