drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
688,123 Commits 1 Branch 0 Tags
Commit Graph

688123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
a5710b954b [automerger skipped] *ServiceStartNotAllowedException shouldn't have a "cause" am: 90819feb5a -s ours am: 97c23b7677 -s ours 
am skip reason: Merged-In I94ba39c775cf95074907db6814104289a577d496 with SHA-1 34af3074f2 is already in history

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

Change-Id: I1e30dbef5c6a1aac0a211cb0159c0637ae099208
 2022-03-22 23:50:07 +00:00
Automerger Merge Worker
0fae732b4f Merge "[automerger skipped] Allow extra keyguard logs to be enabled via adb am: 2dcb5a8188 -s ours" am: 85107fb372 -s ours 
am skip reason: Merged-In I29bb0ffefd57d577b5abe942e227eb2b5baeab4e with SHA-1 17df79ccc0 is already in history

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

Change-Id: I95b6ae007a1f866a20ef2cfaf878b1bc871bf69a
 2022-03-22 23:49:23 +00:00
Beverly
d3be86fe68 [automerger skipped] Allow extra keyguard logs to be enabled via adb am: 2dcb5a8188 -s ours am: ee5bb9efd6 -s ours 
am skip reason: Merged-In I29bb0ffefd57d577b5abe942e227eb2b5baeab4e with SHA-1 17df79ccc0 is already in history

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

Change-Id: If1584a9baefdc9e5b6a73c1edde4747119460806
 2022-03-22 23:49:22 +00:00
Automerger Merge Worker
3669fce278 Merge "[automerger skipped] Revert "Notify display brightness changed due to brightness transforms" am: 74bbae3074 -s ours" am: 7ce3874d06 -s ours 
am skip reason: Merged-In I0a3f805a7e70784d613825db1181f654c57de15d with SHA-1 d817f84a4e is already in history

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

Change-Id: I8685684a86d4e8653b3441f22de693b67802e15e
 2022-03-22 23:48:42 +00:00
Michael Wright
d314aabb25 [automerger skipped] Revert "Notify display brightness changed due to brightness transforms" am: 74bbae3074 -s ours am: 39b7e607bf -s ours 
am skip reason: Merged-In I0a3f805a7e70784d613825db1181f654c57de15d with SHA-1 d817f84a4e is already in history

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

Change-Id: I6b72f91457785ab0240dbb44db343983fdf2ebc8
 2022-03-22 23:48:40 +00:00
Automerger Merge Worker
fa85e5eb34 Merge "[automerger skipped] PiP: Disable enterSplit for now. am: 5c107b0b59 -s ours" am: f9efc14381 -s ours 
am skip reason: Merged-In I6237dd1c88f50733ab24e45806c413d5777032e9 with SHA-1 c03eca68e2 is already in history

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

Change-Id: I1b6c09c358466437c2c78764097f2c3977ec3ac9
 2022-03-22 23:48:06 +00:00
Ben Lin
0c8fa4dc03 [automerger skipped] PiP: Disable enterSplit for now. am: 5c107b0b59 -s ours am: b2bf928783 -s ours 
am skip reason: Merged-In I6237dd1c88f50733ab24e45806c413d5777032e9 with SHA-1 c03eca68e2 is already in history

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

Change-Id: I79580ec1e80582bc2d296cc08536fa0776d4f819
 2022-03-22 23:48:05 +00:00
Automerger Merge Worker
ca1c4e5073 Merge "[automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e1571579e -s ours" am: feed8c99a7 -s ours 
am skip reason: Merged-In I40eb02d73faa4c2476d2a4e136e08c6dcd7795a2 with SHA-1 e392af2817 is already in history

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

Change-Id: I715370ba7e95de49d8be2af556fe98fc2de51bd1
 2022-03-22 23:47:32 +00:00
Dave Mankoff
8b1f746160 [automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e1571579e -s ours am: 9f889e0584 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f9dd192e56e857825538b3b414bba56a73c16d5
 2022-03-22 23:47:31 +00:00
Automerger Merge Worker
3f56c5292a Merge "[automerger skipped] Letterbox apps in multi-window if resizeable only due to supportsPictureInPicture. am: 417fd4d17e -s ours" am: 391569fd69 -s ours 
am skip reason: Merged-In I664742b033ad49a77ae21b28c7ade4011d123c74 with SHA-1 5e7baf6324 is already in history

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

Change-Id: Id1c89e4e4bb17ea83d35585ce83129648991a584
 2022-03-22 23:46:47 +00:00
Mariia Sandrikova
5ee0dd7e52 [automerger skipped] Letterbox apps in multi-window if resizeable only due to supportsPictureInPicture. am: 417fd4d17e -s ours am: d5270cf8a9 -s ours 
am skip reason: Merged-In I664742b033ad49a77ae21b28c7ade4011d123c74 with SHA-1 5e7baf6324 is already in history

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

Change-Id: I446b50504e65a226df97e658a8dd4859286118f2
 2022-03-22 23:46:46 +00:00
Automerger Merge Worker
87e9ffaf62 Merge "[automerger skipped] Fix IME flicker by dispatching unrelated insets after unset IME frozen am: 83c396e9e7 -s ours" am: 2230c3691a -s ours 
am skip reason: Merged-In I95c5b45bd4cf9c30ff7771b2db485c8ae2b0c6db with SHA-1 be42921e05 is already in history

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

Change-Id: Ie7442f57d52c849e3213908d20be2c7ddea45aa9
 2022-03-22 23:46:10 +00:00
Ming-Shin Lu
3d48e3c6d5 [automerger skipped] Fix IME flicker by dispatching unrelated insets after unset IME frozen am: 83c396e9e7 -s ours am: 6aef8318b9 -s ours 
am skip reason: Merged-In I95c5b45bd4cf9c30ff7771b2db485c8ae2b0c6db with SHA-1 be42921e05 is already in history

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

Change-Id: If32e3c9f2381ad0f51b8dc43db7fe94b54188fdc
 2022-03-22 23:46:08 +00:00
Automerger Merge Worker
b4cced1f88 Merge "[automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9bc -s ours" am: 3568a7a8c5 -s ours 
am skip reason: Merged-In I9c401b4cbded8753fc89df25a2c4f88a2fe72087 with SHA-1 ac8151be84 is already in history

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

Change-Id: If74afcec8021705a06071e5ac42f761a63a46974
 2022-03-22 23:45:31 +00:00
Wu Ahan
9ee9ac6fe5 [automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9bc -s ours am: cf9fb94485 -s ours 
am skip reason: Merged-In I9c401b4cbded8753fc89df25a2c4f88a2fe72087 with SHA-1 ac8151be84 is already in history

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

Change-Id: Ic073dc0b8d979259e37b51a09b39766c7be0ce35
 2022-03-22 23:45:21 +00:00
Automerger Merge Worker
3bf3e5c885 Merge "[automerger skipped] Enable nested scrolling for locale picker am: 589f88b9a9 -s ours" am: 9b8871acdd -s ours 
am skip reason: Merged-In Iaf90211da640cd265fc2b23dd34b3149c4406891 with SHA-1 7f4b8b1784 is already in history

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

Change-Id: I7a3ffae0323b4f0d1eff7fd88ad574040866338f
 2022-03-22 23:44:46 +00:00
Mill Chen
e7d923d28a [automerger skipped] Enable nested scrolling for locale picker am: 589f88b9a9 -s ours am: e605577eed -s ours 
am skip reason: Merged-In Iaf90211da640cd265fc2b23dd34b3149c4406891 with SHA-1 7f4b8b1784 is already in history

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

Change-Id: Ie5c4e686fe722ffd2064aba30d477dedfcae1155
 2022-03-22 23:44:45 +00:00
Automerger Merge Worker
c538f21239 Merge "[automerger skipped] Change window type of Media Projection dialog am: e86dacf6ea -s ours" am: 23f7860c1c -s ours 
am skip reason: Merged-In I937678a5d8ee91902c324aa063e48610de7b0f74 with SHA-1 467b282eae is already in history

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

Change-Id: I37cde6dca77617c6f7d00456e56dc6fb070d2c9b
 2022-03-22 23:44:16 +00:00
Fabian Kozynski
a310fd3f0f [automerger skipped] Change window type of Media Projection dialog am: e86dacf6ea -s ours am: bad346a5e4 -s ours 
am skip reason: Merged-In I937678a5d8ee91902c324aa063e48610de7b0f74 with SHA-1 467b282eae is already in history

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

Change-Id: I114a22b226f6219b98d502ab48f5c6b6f8701617
 2022-03-22 23:44:14 +00:00
Automerger Merge Worker
0f20fbf037 Merge "[automerger skipped] Fix leakage of DisplayContent referenced from TransitionController am: 6c04f9b6da -s ours" am: f1710ab1ad -s ours 
am skip reason: Merged-In I44e2a794981fc114ada0ce98cd2471adf623d856 with SHA-1 c3eaf66225 is already in history

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

Change-Id: I8f83f5f8dfcd47e86ef34a3aed9e33467bbf1fa6
 2022-03-22 23:43:39 +00:00
Riddle Hsu
4a65ab8192 [automerger skipped] Fix leakage of DisplayContent referenced from TransitionController am: 6c04f9b6da -s ours am: e993518ad0 -s ours 
am skip reason: Merged-In I44e2a794981fc114ada0ce98cd2471adf623d856 with SHA-1 c3eaf66225 is already in history

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

Change-Id: I65abcfbeb22e21f025cbbf670564e5adde391b5b
 2022-03-22 23:43:32 +00:00
Automerger Merge Worker
b501a1bac3 Merge "[automerger skipped] [Provider Model] Fix the overlap when changing the font/display size am: 941c4a4af0 -s ours" am: 53afae201c -s ours 
am skip reason: Merged-In I10032a866ee05030070b40076fa946c3e73e0d56 with SHA-1 10925e6bf5 is already in history

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

Change-Id: I78ac5e3a80f31f5964a370ae53dbc9d7d139c8c2
 2022-03-22 23:41:24 +00:00
Zoey Chen
aee77bdcba [automerger skipped] [Provider Model] Fix the overlap when changing the font/display size am: 941c4a4af0 -s ours am: 1df9c88a0b -s ours 
am skip reason: Merged-In I10032a866ee05030070b40076fa946c3e73e0d56 with SHA-1 10925e6bf5 is already in history

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

Change-Id: I8c8ed373d337ba6bbcb14de7df1bfc662ebebbfb
 2022-03-22 23:41:19 +00:00
Treehugger Robot
d29e996cb9 Merge "Introduce mutable parcelable request to open/close logical channel" am: 3059d36148 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037108

Change-Id: I80a0a926e396650fce2113f50e1e2031c81c3e9f
 2022-03-22 23:35:32 +00:00
Automerger Merge Worker
bf901995db Merge changes from topic "am-33761c75a1d240df8af3b3cd1fd22513" 
* changes:
  [automerger skipped] Merge "Mark ab/8191998 as merged" into android12L-tests-dev am: b503c60ae9 -s ours
  [automerger skipped] Mark ab/8191998 as merged am: b6de19fa4a -s ours
 2022-03-22 23:32:19 +00:00
Xin Li
6b4a52adc9 [automerger skipped] Merge "Mark ab/8191998 as merged" into android12L-tests-dev am: b503c60ae9 -s ours 
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 837917a6a3 is already in history

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

Change-Id: I8812b0c4d88553ef848c64b4d91218f5996f78c6
 2022-03-22 23:31:52 +00:00
Maria Yang
b3d129d636 [automerger skipped] Mark ab/8191998 as merged am: b6de19fa4a -s ours 
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 837917a6a3 is already in history

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

Change-Id: I25faa6ae899b008999de3cbad950929d6388b87f
 2022-03-22 23:31:14 +00:00
Automerger Merge Worker
7294249768 Merge "Replace BitmapRegionDecoder with ImageDecoder am: 837917a6a3" 2022-03-22 23:29:33 +00:00
Vincent Wang
3f50aa9829 Replace BitmapRegionDecoder with ImageDecoder am: 837917a6a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17128491

Change-Id: Ie06e8adff8d5440ba2bf4f158cab0207ac965c66
 2022-03-22 23:29:22 +00:00
Automerger Merge Worker
7398b0c65e Merge "[automerger skipped] DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync am: b373fd8f77 -s ours" 2022-03-22 23:28:50 +00:00
Mady Mellor
477f4586b6 [automerger skipped] DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync am: b373fd8f77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6dfa54c2cee3345e4da754ff6c38b8a28e688fed
 2022-03-22 23:28:43 +00:00
Automerger Merge Worker
84b6c4ac8b Merge "[automerger skipped] [DO NOT MERGE] Fix regression for enter PIP when onUserLeaveHint am: 15bcf9d7bd -s ours" 2022-03-22 23:28:31 +00:00
Chris Li
273e774f51 [automerger skipped] [DO NOT MERGE] Fix regression for enter PIP when onUserLeaveHint am: 15bcf9d7bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03d03ff8f1268f695704f2b6e2b28e4b8e059248
 2022-03-22 23:28:22 +00:00
Automerger Merge Worker
1a60a17c66 Merge "[automerger skipped] Dispose of input event reciever along with monitor am: 12464ec4c1 -s ours" 2022-03-22 23:28:02 +00:00
Miranda Kephart
29dd69cafa [automerger skipped] Dispose of input event reciever along with monitor am: 12464ec4c1 -s ours 
am skip reason: Merged-In Id201891ffd546119b18b18b692dd87008f6735c2 with SHA-1 7625c27193 is already in history

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

Change-Id: If6ac5338fb2df04ecb720898d8dd066fd4acfc7d
 2022-03-22 23:27:54 +00:00
Automerger Merge Worker
d5240cbb8f Merge "[automerger skipped] Fix missing group alertOverride recalculation am: 2592ea1fc8 -s ours" 2022-03-22 23:27:39 +00:00
Jeff DeCew
33a03df4c8 [automerger skipped] Fix missing group alertOverride recalculation am: 2592ea1fc8 -s ours 
am skip reason: Merged-In I4447810af5e2a17c3b6841dfa5cd31703e5f334d with SHA-1 38d57ffe4a is already in history

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

Change-Id: I8f1af8cdf2d363bdc06b2ce0bd636c1868c8345d
 2022-03-22 23:27:23 +00:00
Automerger Merge Worker
c0b17ff878 Merge "[automerger skipped] Allow alertOverride if the summary GROUP_ALERT_ALL am: bdd4019a16 -s ours" 2022-03-22 23:27:08 +00:00
Jeff DeCew
dede6d5b1f [automerger skipped] Allow alertOverride if the summary GROUP_ALERT_ALL am: bdd4019a16 -s ours 
am skip reason: Merged-In I63a51cc1d94fc8a8617ca76a0fa479e3829816c6 with SHA-1 b479d64878 is already in history

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

Change-Id: I12f8daec444a925f2f589c3c4ec9d1cd9585702e
 2022-03-22 23:26:56 +00:00
Automerger Merge Worker
3c9fa4f583 Merge "[automerger skipped] Fix the animation glitch when NSSL adds and removes a HUN in the same frame. am: 5d54f3c761 -s ours" 2022-03-22 23:26:35 +00:00
Jeff DeCew
b9b0d89948 [automerger skipped] Fix the animation glitch when NSSL adds and removes a HUN in the same frame. am: 5d54f3c761 -s ours 
am skip reason: Merged-In I755fff6944da0699d9cb7e6b2456e4811f7888d5 with SHA-1 878e932203 is already in history

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

Change-Id: I09c6e784e62bab2432ed1abb1ec8d4d686747898
 2022-03-22 23:26:27 +00:00
Automerger Merge Worker
7f8a9ffda8 Merge "[automerger skipped] Check that PowerManager#isInteractive is false before showing the AOD UI for screen off. am: e0d326d3fd -s ours" 2022-03-22 23:26:11 +00:00
Josh Tsuji
12a3badc91 [automerger skipped] Check that PowerManager#isInteractive is false before showing the AOD UI for screen off. am: e0d326d3fd -s ours 
am skip reason: Merged-In I7e2d1ca7e3c9487903f74fb06575cc0a36b9502c with SHA-1 955d37e6d7 is already in history

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

Change-Id: I224333421056af48bf70ac0fdb12bae676c94c06
 2022-03-22 23:26:03 +00:00
Automerger Merge Worker
2d77149b25 Merge "[automerger skipped] *ServiceStartNotAllowedException shouldn't have a "cause" am: 90819feb5a -s ours" 2022-03-22 23:25:52 +00:00
Makoto Onuki
97c23b7677 [automerger skipped] *ServiceStartNotAllowedException shouldn't have a "cause" am: 90819feb5a -s ours 
am skip reason: Merged-In I94ba39c775cf95074907db6814104289a577d496 with SHA-1 34af3074f2 is already in history

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

Change-Id: I78c65196211f5ae8c5f7cf4057316f8579dee061
 2022-03-22 23:25:44 +00:00
Automerger Merge Worker
85107fb372 Merge "[automerger skipped] Allow extra keyguard logs to be enabled via adb am: 2dcb5a8188 -s ours" 2022-03-22 23:25:29 +00:00
Beverly
ee5bb9efd6 [automerger skipped] Allow extra keyguard logs to be enabled via adb am: 2dcb5a8188 -s ours 
am skip reason: Merged-In I29bb0ffefd57d577b5abe942e227eb2b5baeab4e with SHA-1 17df79ccc0 is already in history

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

Change-Id: I8bd8553ca6f1db6ceb6c26e582f556846600f0aa
 2022-03-22 23:25:22 +00:00
Automerger Merge Worker
7ce3874d06 Merge "[automerger skipped] Revert "Notify display brightness changed due to brightness transforms" am: 74bbae3074 -s ours" 2022-03-22 23:25:01 +00:00
Michael Wright
39b7e607bf [automerger skipped] Revert "Notify display brightness changed due to brightness transforms" am: 74bbae3074 -s ours 
am skip reason: Merged-In I0a3f805a7e70784d613825db1181f654c57de15d with SHA-1 d817f84a4e is already in history

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

Change-Id: Ib22be056983b020c3cee2e8dae87df53858604fb
 2022-03-22 23:24:53 +00:00
Automerger Merge Worker
f9efc14381 Merge "[automerger skipped] PiP: Disable enterSplit for now. am: 5c107b0b59 -s ours" 2022-03-22 23:24:43 +00:00