Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
651,558 Commits 3 Branches 0 Tags
041ab635984698eca5d604482ec60d26cfdbca07
Commit Graph

651558 Commits

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

Change-Id: I91d52f5313c6390b5dd13560c08defc3c2e95984
 2021-06-17 17:50:19 +00:00
Dmitri Plotnikov
6b6c08ef43 Implement BatteryUsageStatsStore am: f7e7d084ee am: 72a9116d5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14922032

Change-Id: I2d4e0641b494dcf2a168e552b4c79780fa1d9484
 2021-06-17 17:50:15 +00:00
Dmitri Plotnikov
8593af3d72 Convert BatteryUsageStats to and from XML am: d82aa7e5c4 am: a4a8ded0ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14924566

Change-Id: I391bf719a2f4f8efb687ec2025c8451b8ea7491a
 2021-06-17 17:50:11 +00:00
Dmitri Plotnikov
82c6a11d87 Add BatteryUsageStats.add(BatteryUsageStats) am: 36e0ae27a9 am: e1adca83fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14433337

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

Change-Id: Ica2baa6bbe81903406d0fd9e0f66bf3c74c64e7d
 2021-06-17 17:48:58 +00:00
TreeHugger Robot
8cd7cc41b5 Merge "Load wallpaper bitmap once instead of twice" into sc-dev am: 6d21beab20 am: aa61cd5dbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14985019

Change-Id: I18472a99e6d5bf84ccdcf8092bef08a27edf0946
 2021-06-17 17:48:39 +00:00
Huihong Luo
013c419f0e Merge "Fix potential ASurfaceTransactionCallback leaks" into sc-dev am: fec5e82e69 am: faeca7f0ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14968642

Change-Id: Iae677c9f8ba4d39845c3720b6407f98ded396bea
 2021-06-17 17:48:01 +00:00
Fabian Kozynski
bd8c7b85f1 Merge "Make sure that icons are right aligned in QQS" into sc-dev am: 255565b20c am: ec725928c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982218

Change-Id: I72dd6c599a2b6493fffb6601d80a86ee88450884
 2021-06-17 17:47:50 +00:00
Fabian Kozynski
e9003b6dd1 Merge "Store state of active TileService" into sc-dev am: 22a01eca60 am: 6e09cff449 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14937370

Change-Id: Ie8cae235acd5f83cd2c4c2c8c4f52571adf69381
 2021-06-17 17:47:39 +00:00
Michał Brzeziński
1b2be626e6 Merge "Hiding split shade media container when not needed" into sc-dev am: 0f6b5c9754 am: 77412edb47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14980861

Change-Id: Ida1ac9650673cadc2196f9cf8d23b07ba4fba3b2
 2021-06-17 17:47:26 +00:00
Mariia Sandrikova
1f80471d31 [automerger skipped] Merge "DO NOT MERGE Clean up ADB commands for letterbox and display API sandboxing." into sc-dev am: eb267ed84e -s ours am: e53cd778ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002092

Change-Id: I371566b28778b89fbde79ba5c0158c76d38e5b86
 2021-06-17 17:47:13 +00:00
Dave Mankoff
e678c7af30 resolve merge conflicts of d2455e0c75 to sc-v2-dev am: 5a930d1da0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15013375

Change-Id: I3aea67e5133caa3c6280b271236c44f0c8468633
 2021-06-17 17:46:57 +00:00
Dmitri Plotnikov
7703f73516 Add BatteryUsageStatsQuery parameters: time range am: c24fb81627 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14922773

Change-Id: If06f6990b1e64ade4043759628447ffd1c771ba5
 2021-06-17 17:42:55 +00:00
Dmitri Plotnikov
72a9116d5d Implement BatteryUsageStatsStore am: f7e7d084ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14922032

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

Change-Id: I1aedf01fae80d3e808ea86c90f422524556d4bc8
 2021-06-17 17:42:51 +00:00
Dmitri Plotnikov
e1adca83fe Add BatteryUsageStats.add(BatteryUsageStats) am: 36e0ae27a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14433337

Change-Id: I8b98ec6c4c19b9e8b7ef635c328b337e2122314a
 2021-06-17 17:42:49 +00:00
TreeHugger Robot
d19bd2631e 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: If1f8236442b56715a9ea80dbce6177aa34345f1d
 2021-06-17 17:39:50 +00:00
TreeHugger Robot
aa61cd5dbb 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: I8ebccab6372b9dea96e05978b822628bb63f20e1
 2021-06-17 17:39:36 +00:00
Huihong Luo
faeca7f0ea 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: I945b9192ca166125cf2e0b3579e71b5036bc7a60
 2021-06-17 17:39:21 +00:00
Fabian Kozynski
ec725928c9 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: I2984f8f39fe9ff18a075911d6c8db16ed5781cd2
 2021-06-17 17:39:09 +00:00
Fabian Kozynski
6e09cff449 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: I83eb1af12a97fc37de107be4600049cbe421e8e1
 2021-06-17 17:38:44 +00:00
Michał Brzeziński
77412edb47 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: I711c22d4af91aba7fc1fce73de5c8fc734cec44b
 2021-06-17 17:38:30 +00:00
Mariia Sandrikova
e53cd778ca [automerger skipped] Merge "DO NOT MERGE Clean up ADB commands for letterbox and display API sandboxing." into sc-dev am: eb267ed84e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9f5601ef8c052f4a46febe5cb8bd2d4044d5f7e
 2021-06-17 17:37:48 +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
6d21beab20 Merge "Load wallpaper bitmap once instead of twice" into sc-dev 2021-06-17 16:48:50 +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
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
Dave Mankoff
5a930d1da0 resolve merge conflicts of d2455e0c75 to sc-v2-dev 
Bug: 191150828
Test: atest SystemUITests
Merged-In: I04c2acf528c48eba17a828017de5f70424c09e51
Change-Id: I4f4d128f65204f328118832d7078d46c21ab65d1
 2021-06-17 14:17:16 +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
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
Josh Tsuji
a75d2d8027 Merge "Disable screen off animation in situations where it currently looks bad." into sc-dev am: f3dd83dbae am: 51cfcfd73c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14922150

Change-Id: Ibb77f38a5dc9603c02e5e5b0a4d8f917bfc7863a
 2021-06-17 14:06:47 +00:00
Josh Tsuji
0120379965 Merge "Disable screen off animation in situations where it currently looks bad." into sc-dev am: f3dd83dbae am: 2cbe825c2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14922150

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

Change-Id: I21c071fb10720fdee4bd84a5bbf9de12daae8e2a
 2021-06-17 14:06:11 +00:00
Fiona Campbell
b53055188f Merge "Fix memory leak in BrightnessSynchronizer" into sc-dev am: d77459a21f am: 0052dcef93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551803

Change-Id: Iabaddbe0c15fd538d6b29d0d3a5b3790147c9819
 2021-06-17 14:05:57 +00:00
Dave Mankoff
d2455e0c75 Merge "Remove listeners when destroying GlobalActionsDialog." into sc-dev 2021-06-17 13:56:15 +00:00
Josh Tsuji
51cfcfd73c 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: I5a33da65d5c7ec77689348e123ff5c8f4838c763
 2021-06-17 13:55:04 +00:00
Fiona Campbell
0052dcef93 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: I7cb6750bf25d644c7c244b6bcc4d79bbc5a90559
 2021-06-17 13:54:59 +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
Treehugger Robot
b3fef10d16 [automerger skipped] Merge "Create platformtestprotos." am: c06ebb02a2 am: 4ccdeba9eb -s ours am: 2523b1fbd6 -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: Ib5545b3e1adfba148b37a9f5f3fbf325704c5d54
 2021-06-17 13:52:13 +00:00
TreeHugger Robot
c30001da50 Merge "Catch bubbles exception in PeopleTiles" into sc-dev am: 2c95c7632a am: 95dbd05204 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946990

Change-Id: Ieefcbcc20a57288de0fbdfd3da91a1a747363208
 2021-06-17 13:51:58 +00:00
TreeHugger Robot
ca74f7bafd Merge "Catch bubbles exception in PeopleTiles" into sc-dev am: 2c95c7632a am: 189de9bc1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946990

Change-Id: If28c7f06a7765d50d12be3521cfc28ee265531a7
 2021-06-17 13:51:10 +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
189de9bc1d 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: I8620aac4c330a5ea9e57a52323ce60fb722a16e1
 2021-06-17 13:37:35 +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