Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
488,592 Commits 3 Branches 0 Tags
5b4acfb7f82e4ee6dce816626d8d811d2d87be0e
Commit Graph

488592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
5b4acfb7f8 Merge "AudioService: more fixes for BT A2DP device switch" into rvc-dev am: 200e84a8de am: 9c1720a581 
Change-Id: Ic23288c0929f073758741e334f385349849c0fc6
 2020-05-29 20:40:02 +00:00
Wonsik Kim
ce35ab1577 Merge "media: fix JNI call for 32-bit" into rvc-dev am: dc53f28811 am: 61de665007 
Change-Id: If33482a6fa7bb8852f10f161f281968cc2e5498e
 2020-05-29 20:39:50 +00:00
TreeHugger Robot
1172b33dfa Merge "Add color change listener to NSSL" into rvc-dev am: 3924bc3dca am: 42263dcabd 
Change-Id: I329d9b32736d9820375bc22a11ed29a13c1a9578
 2020-05-29 20:39:40 +00:00
Eric Laurent
9c1720a581 Merge "AudioService: more fixes for BT A2DP device switch" into rvc-dev am: 200e84a8de 
Change-Id: I859b4d3fd71b074daf7dbc2ba2573ae491a4fa0b
 2020-05-29 20:33:50 +00:00
Eric Laurent
200e84a8de Merge "AudioService: more fixes for BT A2DP device switch" into rvc-dev 2020-05-29 20:26:20 +00:00
Wonsik Kim
61de665007 Merge "media: fix JNI call for 32-bit" into rvc-dev am: dc53f28811 
Change-Id: I2694a31435ecb35252c22c8f0855f15f6314cdb5
 2020-05-29 20:25:08 +00:00
TreeHugger Robot
42263dcabd Merge "Add color change listener to NSSL" into rvc-dev am: 3924bc3dca 
Change-Id: Ib11c4f08fdb4787a3f5613041d713f557bdcab79
 2020-05-29 20:24:35 +00:00
Wonsik Kim
dc53f28811 Merge "media: fix JNI call for 32-bit" into rvc-dev 2020-05-29 20:18:13 +00:00
TreeHugger Robot
3924bc3dca Merge "Add color change listener to NSSL" into rvc-dev 2020-05-29 20:09:24 +00:00
TreeHugger Robot
95c690edf1 Merge "Fix typo in Conversations notification." into rvc-dev am: 49d74e701f am: 35cefaab5a 
Change-Id: Ib2a27e0a5962aa725dea0a7b208d99a3cfbc0e48
 2020-05-29 20:03:27 +00:00
Chavi Weingarten
2eda752a06 Merge "Allow Tasks to set some properties for migrated SC" into rvc-dev am: 54eec4b7f6 am: 91c540c2e8 
Change-Id: I894b3f135c22786fe782c124046428620b6b5330
 2020-05-29 20:02:57 +00:00
TreeHugger Robot
35cefaab5a Merge "Fix typo in Conversations notification." into rvc-dev am: 49d74e701f 
Change-Id: I0a18ca24d3f148ad58b08b3fbae02fbfa1c44c5a
 2020-05-29 19:55:39 +00:00
TreeHugger Robot
49d74e701f Merge "Fix typo in Conversations notification." into rvc-dev 2020-05-29 19:54:38 +00:00
Chavi Weingarten
91c540c2e8 Merge "Allow Tasks to set some properties for migrated SC" into rvc-dev am: 54eec4b7f6 
Change-Id: I8bd175ad6561d911c5b7835c4d419ceb3aa895d6
 2020-05-29 19:50:07 +00:00
TreeHugger Robot
11c76261f5 Merge "Lifecycle: detecting blocked and unhealthy, part 2." into rvc-dev am: 825ad11167 am: 03c17047f0 
Change-Id: I5e162388392ae8dfe6b507e111590408c124465a
 2020-05-29 19:35:38 +00:00
TreeHugger Robot
4f69f5b9f1 Merge "Close a file descriptor that's a copy of the one that the receiver receives." into rvc-dev am: 219daf9eef am: ebf33109ff 
Change-Id: I805bc44ed0182e60531f518a43944d07585e9a60
 2020-05-29 19:34:55 +00:00
Chavi Weingarten
54eec4b7f6 Merge "Allow Tasks to set some properties for migrated SC" into rvc-dev 2020-05-29 19:31:57 +00:00
TreeHugger Robot
03c17047f0 Merge "Lifecycle: detecting blocked and unhealthy, part 2." into rvc-dev am: 825ad11167 
Change-Id: Ia1690714898b220ff1f287bab6f1333255635251
 2020-05-29 19:18:56 +00:00
TreeHugger Robot
ebf33109ff Merge "Close a file descriptor that's a copy of the one that the receiver receives." into rvc-dev am: 219daf9eef 
Change-Id: Ic46b4ff1028bfd49a54e88ecc499edc91ab4afee
 2020-05-29 19:18:08 +00:00
TreeHugger Robot
825ad11167 Merge "Lifecycle: detecting blocked and unhealthy, part 2." into rvc-dev 2020-05-29 19:04:37 +00:00
TreeHugger Robot
219daf9eef Merge "Close a file descriptor that's a copy of the one that the receiver receives." into rvc-dev 2020-05-29 19:01:30 +00:00
TreeHugger Robot
feea06c9ae Merge "Revert "Don't kill apps for OP_REQUEST_INSTALL_PACKAGES on targetSdk < 26."" into rvc-dev am: d4fe81e7e7 am: 6bccb52807 
Change-Id: I8f42a99a18aab5dd7887b75b2c100677a8546f93
 2020-05-29 18:43:54 +00:00
TreeHugger Robot
6bccb52807 Merge "Revert "Don't kill apps for OP_REQUEST_INSTALL_PACKAGES on targetSdk < 26."" into rvc-dev am: d4fe81e7e7 
Change-Id: I055922048608c1998ac44d1f200bd997e69ca393
 2020-05-29 18:31:35 +00:00
TreeHugger Robot
d4fe81e7e7 Merge "Revert "Don't kill apps for OP_REQUEST_INSTALL_PACKAGES on targetSdk < 26."" into rvc-dev 2020-05-29 18:27:45 +00:00
Dave Mankoff
853ae8c67e Add color change listener to NSSL 
Adds a ColorExtractor.OnColorsChangedListener to the
NotificiationStackScrollLayout. Move some of the related code from
onThemeChanged to the new listener so that it gets all the same
calls that the ScrimController gets when the wallpaper changes.

Bug: 150143437
Test: manual
Change-Id: I687f606ea28e699dc46df8c08af13010c41d6ae2
 2020-05-29 14:25:05 -04:00
TreeHugger Robot
78af6083a8 Merge changes from topic "controls_config" into rvc-dev am: 61d46be2c2 am: 181c47ad64 
Change-Id: Ib4b2febd14fd02cf1d073d2f0e7010f15ff93591
 2020-05-29 18:15:25 +00:00
TreeHugger Robot
0de354d16e Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes.""" into rvc-dev am: 664ef14581 am: e498bbb34e 
Change-Id: I1e41523c6adda4af30c33d57c679b48e5ec913c1
 2020-05-29 18:15:17 +00:00
TreeHugger Robot
181c47ad64 Merge changes from topic "controls_config" into rvc-dev am: 61d46be2c2 
Change-Id: Ifcba3a0e09e93748dfcad14d1baaab20d430885f
 2020-05-29 18:14:50 +00:00
Ryan Mitchell
7473fd1f4e Merge "Install system app in greatest priority partition" into rvc-dev am: d32418a72a am: d5bfbd0f27 
Change-Id: I4034a66936d2637b301a4e9d9cdc201ecc7c18c5
 2020-05-29 18:14:50 +00:00
TreeHugger Robot
61d46be2c2 Merge changes from topic "controls_config" into rvc-dev 
* changes:
  Controls UI - Allow seeding for multiple apps
  Controls UI - Support seeding for up to 6 structures
 2020-05-29 18:12:43 +00:00
TreeHugger Robot
e498bbb34e Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes.""" into rvc-dev am: 664ef14581 
Change-Id: Ied93c7a8cb970a00f55ec781c3837e703487ce6c
 2020-05-29 18:11:54 +00:00
Ryan Mitchell
d5bfbd0f27 Merge "Install system app in greatest priority partition" into rvc-dev am: d32418a72a 
Change-Id: I0eff29ef53abbafb14e0210aa40b1c6bc02c6900
 2020-05-29 18:11:28 +00:00
Jeff DeCew
2cba4d1db1 Fix typo in Conversations notification. 
Test: manual, visual
Fix: 155497988
Change-Id: I3d15896a20f80adfd408ed09f57e4d7cc01d8e2e
 2020-05-29 14:08:10 -04:00
TreeHugger Robot
664ef14581 Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes.""" into rvc-dev 2020-05-29 18:07:16 +00:00
Ryan Mitchell
d32418a72a Merge "Install system app in greatest priority partition" into rvc-dev 2020-05-29 18:05:31 +00:00
Evan Rosky
fc7ccecd51 Merge "Post insets update to handler" into rvc-dev am: dcb47baf63 am: 0233bf77eb 
Change-Id: Ie956eef4f77fe4fbde745bfd690639111c9e6169
 2020-05-29 18:04:50 +00:00
Jing Ji
ac3faba4d2 Merge "Don't reset OOM adjType to cch-empty during recomputing on cycles" into rvc-dev am: e72bd54f44 am: fcf7ca34a0 
Change-Id: I98b56b2a3f003077b32808d2b65dcf095515895b
 2020-05-29 18:04:36 +00:00
TreeHugger Robot
a89da9dd49 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 31e7a3411e -s ours 
am skip reason: subject contains skip directive

Change-Id: Iaa2898f59ba6a03314ca2d14fc29f9ab1e6382ad
 2020-05-29 18:04:20 +00:00
TreeHugger Robot
38e05eedd2 Merge "Avoid Asset::LoadImpl crash when getBuffer is null" into rvc-dev am: 058945a476 am: 87fe5e01cd 
Change-Id: Ie845cd0e4b3db8636c059b156b20cd89a6af64b6
 2020-05-29 18:04:06 +00:00
Evan Rosky
0233bf77eb Merge "Post insets update to handler" into rvc-dev am: dcb47baf63 
Change-Id: I263a18fa4a7d461310d6be55f68ab2248022e8f7
 2020-05-29 18:03:41 +00:00
Evan Rosky
dcb47baf63 Merge "Post insets update to handler" into rvc-dev 2020-05-29 17:59:52 +00:00
Jing Ji
fcf7ca34a0 Merge "Don't reset OOM adjType to cch-empty during recomputing on cycles" into rvc-dev am: e72bd54f44 
Change-Id: I39fd43c52c01b7001f266821806312684bd52163
 2020-05-29 17:58:28 +00:00
TreeHugger Robot
31e7a3411e Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-29 17:57:18 +00:00
Jing Ji
e72bd54f44 Merge "Don't reset OOM adjType to cch-empty during recomputing on cycles" into rvc-dev 2020-05-29 17:55:00 +00:00
TreeHugger Robot
87fe5e01cd Merge "Avoid Asset::LoadImpl crash when getBuffer is null" into rvc-dev am: 058945a476 
Change-Id: I1b76674a47ec8058a63252148c629958648fa49b
 2020-05-29 17:53:17 +00:00
Agatha Man
e68f19d77e Merge "Ignore public volume state change event of removed user in Automotive" into rvc-dev am: 2719662512 am: 1bc437175e 
Change-Id: I5f72109bb43ee1b70b91d0f9697a3bc7b008158e
 2020-05-29 17:45:16 +00:00
Benedict Wong
1c0cc3f3d8 Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: c5401ef015 am: b7e4fc0606 
Change-Id: Idb9832fc22350234537b717a0e07cb8a4684ffba
 2020-05-29 17:45:08 +00:00
TreeHugger Robot
058945a476 Merge "Avoid Asset::LoadImpl crash when getBuffer is null" into rvc-dev 2020-05-29 17:45:05 +00:00
Hongwei Wang
9996ddf2a3 Merge "Do not reset shelf offset during fixed rotation" into rvc-dev am: 2406027233 am: 3d14dc9cd0 
Change-Id: Ib0237d93f55349babfccc7c355112b0df28fbdb7
 2020-05-29 17:44:40 +00:00
Nate Jiang
1edbc343a1 Merge "WifiNetworkSuggestion setIsMetered change to tri-state" into rvc-dev am: 34de847886 am: 57b930197f 
Change-Id: I7671886f8bbac1a6efc3d4ac2873c065fd183c89
 2020-05-29 17:44:29 +00:00