Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
647,312 Commits 3 Branches 0 Tags
376aed6bbae538380df71fcd680139c1925fb873
Commit Graph

647312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitri Plotnikov
376aed6bba Add BatteryUsageStatsQuery parameters: time range am: c24fb81627 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14922773

Change-Id: I8c31a2ced556edda35c10d1a61c882a762daa4a7
 2021-06-17 17:31:20 +00:00
Dmitri Plotnikov
672745dd06 Implement BatteryUsageStatsStore am: f7e7d084ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14922032

Change-Id: I4c1bca3f65b56e34187a8a47acdde65ee6c399ad
 2021-06-17 17:31:17 +00:00
Dmitri Plotnikov
71f5b12c59 Convert BatteryUsageStats to and from XML am: d82aa7e5c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14924566

Change-Id: I3b26ea5eda912cbd933335074a417544d3ddb250
 2021-06-17 17:31:10 +00:00
Dmitri Plotnikov
7cd1108de1 Add BatteryUsageStats.add(BatteryUsageStats) am: 36e0ae27a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14433337

Change-Id: I3db68694883fbf0da74c14a23bda1519ac233c39
 2021-06-17 17:31:04 +00:00
TreeHugger Robot
ce06d1203c Merge "Revert "wfd: release wifi p2p resource on disconnecting from WFD service."" into sc-dev am: c3c3fbbaa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15008435

Change-Id: Ib18ba46b66640d930afea599c46c6dcd2b0328b9
 2021-06-17 17:22:04 +00:00
TreeHugger Robot
c3c3fbbaa3 Merge "Revert "wfd: release wifi p2p resource on disconnecting from WFD service."" into sc-dev 2021-06-17 17:10:05 +00:00
TreeHugger Robot
2137220dd0 Merge "Load wallpaper bitmap once instead of twice" into sc-dev am: 6d21beab20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14985019

Change-Id: I20b57a0dfe4c08c8d481a61ef5a8e0be598a09f9
 2021-06-17 16:49:15 +00:00
TreeHugger Robot
6d21beab20 Merge "Load wallpaper bitmap once instead of twice" into sc-dev 2021-06-17 16:48:50 +00:00
Huihong Luo
945ba67819 Merge "Fix potential ASurfaceTransactionCallback leaks" into sc-dev am: fec5e82e69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14968642

Change-Id: I0c789262092ab7817b194936788993d53fe047ae
 2021-06-17 16:48:42 +00:00
Huihong Luo
fec5e82e69 Merge "Fix potential ASurfaceTransactionCallback leaks" into sc-dev 2021-06-17 16:32:06 +00:00
Jimmy Chen
8aa14ab547 Revert "wfd: release wifi p2p resource on disconnecting from WFD service." 
This reverts commit fa0aeee678.
Reason for revert: during the disconnection, there are still codes using WifiP2pService.

Bug: 184504089
Test: execute "adb shell setprop persist.debug.wfd.enable 1" and restart the DUT
Change-Id: I0f5a31e072e31fb10f0efe667caa6a6d85942867
 2021-06-17 16:16:58 +00:00
Fabian Kozynski
bc54f3102a Merge "Make sure that icons are right aligned in QQS" into sc-dev am: 255565b20c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982218

Change-Id: I10553388681fd68302b63373ce910a9e60648d48
 2021-06-17 14:53:28 +00:00
Fabian Kozynski
5790deb52a Merge "Store state of active TileService" into sc-dev am: 22a01eca60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14937370

Change-Id: Idc07cf6657e5033b00cba06265f2b1db32a07fce
 2021-06-17 14:53:15 +00:00
Fabian Kozynski
255565b20c Merge "Make sure that icons are right aligned in QQS" into sc-dev 2021-06-17 14:41:12 +00:00
Fabian Kozynski
22a01eca60 Merge "Store state of active TileService" into sc-dev 2021-06-17 14:40:52 +00:00
Michał Brzeziński
22882f425d Merge "Hiding split shade media container when not needed" into sc-dev am: 0f6b5c9754 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14980861

Change-Id: Ic08ae6a409ae8b7918d5cf7dc1aacaf8ca98c5d2
 2021-06-17 14:35:30 +00:00
Lorenzo Colitti
1f7285bda6 [automerger skipped] Merge "Apply ag/12775659 to IpClientManager." am: 77ba0a4383 am: 14f751c834 -s ours 
am skip reason: Merged-In I74cb958b68d55a647547aae21baff6ddc364859b with SHA-1 b93712f623 is already in history

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

Change-Id: I16bc49cd9105d28737ae5591e95c54a645377f3c
 2021-06-17 14:35:13 +00:00
Michał Brzeziński
0f6b5c9754 Merge "Hiding split shade media container when not needed" into sc-dev 2021-06-17 14:17:06 +00:00
Mariia Sandrikova
96728c3408 Merge "DO NOT MERGE Clean up ADB commands for letterbox and display API sandboxing." into sc-dev am: eb267ed84e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002092

Change-Id: Ib2522e569dba006c26d34483bab6d7c94b6b7642
 2021-06-17 14:09:37 +00:00
Mariia Sandrikova
a9db8a0f61 DO NOT MERGE Clean up ADB commands for letterbox and display API sandboxing. am: 200431be5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002092

Change-Id: I89929f59eb403cbb61edf60ea282cbe4f22780b7
 2021-06-17 14:09:28 +00:00
Dave Mankoff
eef5117adf Merge "Remove listeners when destroying GlobalActionsDialog." into sc-dev am: d2455e0c75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15000573

Change-Id: I81f0d6c70198536f7c9fcef7c0968d8a8c89af34
 2021-06-17 14:08:49 +00:00
Mariia Sandrikova
eb267ed84e Merge "DO NOT MERGE Clean up ADB commands for letterbox and display API sandboxing." into sc-dev 2021-06-17 14:08:01 +00:00
Lorenzo Colitti
14f751c834 Merge "Apply ag/12775659 to IpClientManager." am: 77ba0a4383 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1739193

Change-Id: I45986d1a7c41060bd617ad6efdf613188b60aef0
 2021-06-17 14:06:28 +00:00
Dave Mankoff
d2455e0c75 Merge "Remove listeners when destroying GlobalActionsDialog." into sc-dev 2021-06-17 13:56:15 +00:00
Josh Tsuji
2cbe825c2d Merge "Disable screen off animation in situations where it currently looks bad." into sc-dev am: f3dd83dbae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14922150

Change-Id: I042aaaab3bd3d00d102dc3afe976bdc031b747f1
 2021-06-17 13:54:50 +00:00
Fiona Campbell
97f24b694e Merge "Fix memory leak in BrightnessSynchronizer" into sc-dev am: d77459a21f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551803

Change-Id: I71749d5e0aefcbac60f112952e889fe5f6783759
 2021-06-17 13:54:36 +00:00
Lorenzo Colitti
77ba0a4383 Merge "Apply ag/12775659 to IpClientManager." 2021-06-17 13:53:48 +00:00
Josh Tsuji
f3dd83dbae Merge "Disable screen off animation in situations where it currently looks bad." into sc-dev 2021-06-17 13:45:21 +00:00
Fiona Campbell
d77459a21f Merge "Fix memory leak in BrightnessSynchronizer" into sc-dev 2021-06-17 13:41:45 +00:00
Treehugger Robot
2523b1fbd6 [automerger skipped] Merge "Create platformtestprotos." am: c06ebb02a2 am: 4ccdeba9eb -s ours 
am skip reason: Merged-In I82386a6c8a5e6ddf42d8377148001f4ede2f297f with SHA-1 d61699e86c is already in history

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

Change-Id: I81c81e0c28089929262a2da203dd14cb0ca7e72a
 2021-06-17 13:37:31 +00:00
TreeHugger Robot
95dbd05204 Merge "Catch bubbles exception in PeopleTiles" into sc-dev am: 2c95c7632a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946990

Change-Id: Id0ff298f70f2d71f9d86e18b4ed49e0ed0d29066
 2021-06-17 13:37:13 +00:00
TreeHugger Robot
2c95c7632a Merge "Catch bubbles exception in PeopleTiles" into sc-dev 2021-06-17 13:26:52 +00:00
Treehugger Robot
4ccdeba9eb Merge "Create platformtestprotos." am: c06ebb02a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1723395

Change-Id: Ia1186d6019a60bea41a65c7563824f895cf0c130
 2021-06-17 13:12:15 +00:00
TreeHugger Robot
8e03a241f5 Merge "KeyguardIndication text updates" into sc-dev am: 0ec737dab8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986727

Change-Id: I7f7d39e3212773a7349acd36dc3938d23870f921
 2021-06-17 13:10:25 +00:00
Mathew Inwood
5fe8ac2cbd Merge "Use non-logging compat framework calls" into sc-dev am: 4d4f39980c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14997040

Change-Id: Idb307077c0e7e116f406b54f1f1bb4e8962a9ddd
 2021-06-17 13:10:00 +00:00
Treehugger Robot
c06ebb02a2 Merge "Create platformtestprotos." 2021-06-17 12:53:11 +00:00
TreeHugger Robot
0ec737dab8 Merge "KeyguardIndication text updates" into sc-dev 2021-06-17 12:48:23 +00:00
Mathew Inwood
4d4f39980c Merge "Use non-logging compat framework calls" into sc-dev 2021-06-17 12:46:07 +00:00
Lorenzo Colitti
246c5d92c6 Apply ag/12775659 to IpClientManager. 
ag/12775659 was merged only in internal gerrit and prevents us
from moving or deleting IpClientManager in AOSP.

Apply to IpClientManager the changes made in that CL.

Test: m
Bug: 155703208
Merged-In: I74cb958b68d55a647547aae21baff6ddc364859b
Change-Id: I9e1f9bf5b28b87cfd40cf3abbf8bcd9abf46ecfe
 2021-06-17 21:43:38 +09:00
Treehugger Robot
0eeb801d32 Merge "Add OWNERS for WM proto files" am: c14325dbdc am: 2bae704d44 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1738299

Change-Id: I6cf39d9e11453615e2b11962ee86be15746c31f4
 2021-06-17 11:52:00 +00:00
Treehugger Robot
2bae704d44 Merge "Add OWNERS for WM proto files" am: c14325dbdc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1738299

Change-Id: Ie6b2b1971984c4b39f39f981030b59a67caf955b
 2021-06-17 11:27:09 +00:00
Pavel Grafov
89af5adc32 Merge "More debug for security loggin broadcast" into sc-dev am: 6f5fe9271d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002450

Change-Id: Ib378a9ac45565ff1a82d6db7bd6e963a1a235ccc
 2021-06-17 11:16:24 +00:00
Treehugger Robot
c14325dbdc Merge "Add OWNERS for WM proto files" 2021-06-17 11:09:39 +00:00
Pavel Grafov
6f5fe9271d Merge "More debug for security loggin broadcast" into sc-dev 2021-06-17 11:04:37 +00:00
Bram Bonné
54592ead98 Merge "Allow app's targetSDK to overwrite SELINUX_LATEST_CHANGES SDK" am: 32d031336d am: 1a482e6be6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1737554

Change-Id: Iffc3c6abbd6b215f530723c5dc420e368bb7eb2d
 2021-06-17 10:25:53 +00:00
Bram Bonné
1a482e6be6 Merge "Allow app's targetSDK to overwrite SELINUX_LATEST_CHANGES SDK" am: 32d031336d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1737554

Change-Id: Id64cca5d9eb784c28320f335c1c912be8da12847
 2021-06-17 09:58:34 +00:00
Bram Bonné
32d031336d Merge "Allow app's targetSDK to overwrite SELINUX_LATEST_CHANGES SDK" 2021-06-17 09:42:31 +00:00
Robin Lee
1cf93a9d11 Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev am: 8766e5c15e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974997

Change-Id: I61cd8295d32795d7cd454a49040a7668510780ed
 2021-06-17 09:36:46 +00:00
Pedro Loureiro
255c7ee3bc [automerger skipped] Merge "Run bpfmt on api/Android.bp" into sc-dev am: 2ae1e25b80 -s ours 
am skip reason: Merged-In I4c7b49e6b5f9b3bec2aba305f8a6eb5e1d0561de with SHA-1 4f09b85b38 is already in history

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

Change-Id: I6d6e1be77c248c3bb01130a79b93db203bb74844
 2021-06-17 09:36:05 +00:00
Robin Lee
8766e5c15e Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev 2021-06-17 09:30:28 +00:00