Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202,357 Commits 3 Branches 0 Tags
0c25fbde829a5bb5cecc74df01c14e75292cebfd
Commit Graph

2537 Commits

Author SHA1 Message Date
Adam Lesinski
d28292f319 am 52e7f8c7: am bd9b25ef: am b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev 
* commit '52e7f8c76f78176ae33c22118e2f05626923c724':
  BatteryStats: Record doze wake locks
 2015-06-19 21:48:37 +00:00
Adam Lesinski
9425fe21c9 BatteryStats: Record doze wake locks 
Doze wake locks don't actually hold the CPU awake, so we should record them
separately from full wakelocks, which is what we did before.

Bug:21949905
Change-Id: Ib4db3399069e0ad11f1f0dc6925a87ad0ad21ff9
 2015-06-19 14:12:01 -07:00
David Srbecky
f32f7a3ffd Merge "Replace --include-cfi with --generate-debug-info." into mnc-dev 2015-06-19 18:26:42 +00:00
Dianne Hackborn
6c32b58bf1 am 50bf0203: am 1594edce: am 0348ba2e: Merge "Fix issue #20494208: Go out of device idle when headset button is pressed" into mnc-dev 
* commit '50bf0203b9ed0ac5c72ad6b2e2fcc1a6737bb565':
  Fix issue #20494208: Go out of device idle when headset button is pressed
 2015-06-19 14:17:59 +00:00
Adam Lesinski
6c2a8e0da8 am 9f0179cc: am a0578a02: am 00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev 
* commit '9f0179cc5f6f74a6b9957f60526353898f02ac0b':
  BatteryStats: Fix regression in wakelock power distribution
 2015-06-19 14:17:52 +00:00
Dianne Hackborn
50bf0203b9 am 1594edce: am 0348ba2e: Merge "Fix issue #20494208: Go out of device idle when headset button is pressed" into mnc-dev 
* commit '1594edcea1e8862827410f2542d19c5edb403cbe':
  Fix issue #20494208: Go out of device idle when headset button is pressed
 2015-06-19 13:58:20 +00:00
Adam Lesinski
9f0179cc5f am a0578a02: am 00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev 
* commit 'a0578a025949b0759dbd6109b60c2c560b03b2d5':
  BatteryStats: Fix regression in wakelock power distribution
 2015-06-19 13:58:09 +00:00
David Srbecky
065075e1f9 Replace --include-cfi with --generate-debug-info. 
This follows a change in dex2oat.

(cherry picked from commit f39477b592)

Bug: 21924613
Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
 2015-06-19 02:20:06 +01:00
Dianne Hackborn
0348ba2e23 Merge "Fix issue #20494208: Go out of device idle when headset button is pressed" into mnc-dev 2015-06-19 01:01:38 +00:00
Adam Lesinski
00fac63575 Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev 2015-06-19 00:57:47 +00:00
Dianne Hackborn
b6683c4286 Fix issue #20494208: Go out of device idle when headset button is pressed 
Rework how we record active transitions in battery stats to be
more general, and add an API that others can call in to
DeviceIdleController to request that we go out of idle mode.
use this for VOICE_SEARCH_HANDS_FREE.

Change-Id: Ie58de60e63036a4142881283835961fbcceec892
 2015-06-18 17:40:33 -07:00
Adam Lesinski
72478f053f BatteryStats: Fix regression in wakelock power distribution 
We used to give 50% of the cpu time of each app to any app holding a wakelock
while the screen is off.
Since we switched to the new kernel module for measuring app's cpu time, this distribution
was lost.

Bug:21876567
Change-Id: I42c294547f63d150d9929271ca0e27fedaaa9d77
 2015-06-18 12:09:25 -07:00
Xiaohui Chen
6d1f8c75cd am 16834d76: am 82422c31: am 802ece61: Merge "system_server: add two child chains to firewall" into mnc-dev 
* commit '16834d76072ec1c8049856d355e7cc3bd0ce6a40':
  system_server: add two child chains to firewall
 2015-06-18 00:31:15 +00:00
Xiaohui Chen
16834d7607 am 82422c31: am 802ece61: Merge "system_server: add two child chains to firewall" into mnc-dev 
* commit '82422c313e5efc80c917afdcf532d6616fbc2313':
  system_server: add two child chains to firewall
 2015-06-18 00:20:22 +00:00
Xiaohui Chen
802ece6139 Merge "system_server: add two child chains to firewall" into mnc-dev 2015-06-17 23:50:28 +00:00
Xiaohui Chen
b41c9f7f39 system_server: add two child chains to firewall 
This is an attempt to speed up getting out of device idle.  It groups
uid firewall rules in these child chains so we can attach/detach a whole
chain instead of individual uid rules.

BUG:21446713
Change-Id: Ie8f392da2deabe7cc86a9ecf4ed080163861d41e
 2015-06-17 15:55:37 -07:00
Jeff Sharkey
1142341872 am 10d045cd: am 716978e3: am 2cc03e56: Yet another user restriction. 
* commit '10d045cd08a60403056f90f03b8f79dc0bf18571':
  Yet another user restriction.
 2015-06-16 05:44:15 +00:00
Jeff Sharkey
10d045cd08 am 716978e3: am 2cc03e56: Yet another user restriction. 
* commit '716978e36b30f339e615eee289a8cbc6f68a4df4':
  Yet another user restriction.
 2015-06-16 05:28:43 +00:00
Jeff Sharkey
2cc03e5606 Yet another user restriction. 
Change-Id: Ia2952da19cb974a6a9ba0271a298a10df58b8d18
 2015-06-15 21:50:47 -07:00
Dianne Hackborn
1317a6585c am d5111d46: am 4169b628: am 285cb414: Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev 
* commit 'd5111d46d6589921c3ad3d7ee6771ccc0e257f8f':
  Fix issue #21813831: Need API for asking to be added to power whitelist
 2015-06-15 19:49:46 +00:00
Dianne Hackborn
d5111d46d6 am 4169b628: am 285cb414: Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev 
* commit '4169b6282f78a8027cc0e4c2f3ca4f0f05c57d08':
  Fix issue #21813831: Need API for asking to be added to power whitelist
 2015-06-15 19:37:15 +00:00
Dianne Hackborn
1958e5e787 Fix issue #21813831: Need API for asking to be added to power whitelist 
Add the API.  Clean up a few related things.

Change-Id: I190adad1812f36f6095b98a1001fedb94874e8b5
 2015-06-15 11:53:59 -07:00
Makoto Onuki
a84fc38bdf am 92177ad7: am b3be7c26: am 80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 
* commit '92177ad765b86f77e86a29e9d013883af9fec134':
  Add StorageEventListener.onDiskDestroyed()
 2015-06-13 00:29:45 +00:00
Makoto Onuki
92177ad765 am b3be7c26: am 80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 
* commit 'b3be7c26977ecebd9efd899ae5ef39e0552785aa':
  Add StorageEventListener.onDiskDestroyed()
 2015-06-13 00:16:16 +00:00
Makoto Onuki
80b34d7b9d Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 2015-06-12 23:56:10 +00:00
Jeff Sharkey
76e0067158 am ed547496: am e4872995: am 1d04e6a6: Merge "More useful extras in disk/volume broadcasts." into mnc-dev 
* commit 'ed547496691b65ae45252aee9471fb36b39bacc3':
  More useful extras in disk/volume broadcasts.
 2015-06-12 23:52:28 +00:00
Adam Lesinski
3079bd42f5 am f0380592: am c32eec37: am 87a79c39: Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev 
* commit 'f03805920880c007b443a8a3a0c60efcfc396dc4':
  BatteryStatsHelper: Fix some lost power
 2015-06-12 23:52:23 +00:00
Jeff Sharkey
ed54749669 am e4872995: am 1d04e6a6: Merge "More useful extras in disk/volume broadcasts." into mnc-dev 
* commit 'e4872995224bca8371188d1b07e58871cc2aed7b':
  More useful extras in disk/volume broadcasts.
 2015-06-12 23:39:25 +00:00
Adam Lesinski
f038059208 am c32eec37: am 87a79c39: Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev 
* commit 'c32eec37908a4d45c82bc4984fd9b68cb25949a8':
  BatteryStatsHelper: Fix some lost power
 2015-06-12 23:39:21 +00:00
Jeff Sharkey
1d04e6a6cd Merge "More useful extras in disk/volume broadcasts." into mnc-dev 2015-06-12 23:19:34 +00:00
Jeff Sharkey
c7acac6798 More useful extras in disk/volume broadcasts. 
Change-Id: I594166cff332aaf72b2b6357ac6ed3e6e42cbc49
 2015-06-12 16:16:56 -07:00
Adam Lesinski
57123001a4 BatteryStatsHelper: Fix some lost power 
Looks like we were losing some power calculations from the CPU side of Bluetooth and
WiFi if there was no controller activity ocurring.

Also add finer breakdown of power to BatteryStats dumpsys for WiFi and Bluetooth.

Change-Id: Ic3ce3e4e3b854f17f9a32fd4bdc47a8ea74ca439
 2015-06-12 16:12:07 -07:00
Makoto Onuki
9dc575d63c Add StorageEventListener.onDiskDestroyed() 
Bug 21336042

Change-Id: I226cf205191dd302ff8d5156f9ae0fe8fc5b2c2b
 2015-06-12 16:11:46 -07:00
Amith Yamasani
700a1b9f8a am db589a3d: am dc0df828: am ffff74ab: Merge "Report app standby state to batterystats" into mnc-dev 
* commit 'db589a3d0dff105f80672ad541a096d9b60e2520':
  Report app standby state to batterystats
 2015-06-12 18:30:48 +00:00
Amith Yamasani
db589a3d0d am dc0df828: am ffff74ab: Merge "Report app standby state to batterystats" into mnc-dev 
* commit 'dc0df828a2d93828696cf6b09e02de0af5717cb4':
  Report app standby state to batterystats
 2015-06-12 18:17:58 +00:00
Amith Yamasani
ffff74abb1 Merge "Report app standby state to batterystats" into mnc-dev 2015-06-12 17:52:55 +00:00
Dianne Hackborn
f8b3253180 am ccd6d0c1: am d55860d9: am 8a435ced: Merge "Fix APIs." into mnc-dev 
* commit 'ccd6d0c14decd111e7e12bf9844fa5ff75aa912e':
  Fix APIs.
 2015-06-12 17:48:22 +00:00
Dianne Hackborn
ccd6d0c14d am d55860d9: am 8a435ced: Merge "Fix APIs." into mnc-dev 
* commit 'd55860d990587509f0e9624c44494172f3e24714':
  Fix APIs.
 2015-06-12 17:31:21 +00:00
Dianne Hackborn
8a435ced67 Merge "Fix APIs." into mnc-dev 2015-06-12 16:34:38 +00:00
Amith Yamasani
6776849dc5 Report app standby state to batterystats 
Also reduce idle checks to the target user if possible.
Optimized calls to some internal methods

Bug: 21639147
Change-Id: If1faf26f862e5c4ca905f2603a4ba52a8d1af954
 2015-06-12 09:05:22 -07:00
Jeff Sharkey
018913fe24 am c1a54115: am 2e9704f9: am 5347f0ff: Merge "Valid filenames have length limits!" into mnc-dev 
* commit 'c1a54115bdf8eead6e84e776c990a567d9d3e47c':
  Valid filenames have length limits!
 2015-06-12 05:15:36 +00:00
Jeff Sharkey
c1a54115bd am 2e9704f9: am 5347f0ff: Merge "Valid filenames have length limits!" into mnc-dev 
* commit '2e9704f969df4d140f4c54243c6faabf17517144':
  Valid filenames have length limits!
 2015-06-12 02:41:30 +00:00
Jeff Sharkey
5347f0ff38 Merge "Valid filenames have length limits!" into mnc-dev 2015-06-12 02:18:29 +00:00
Jeff Sharkey
4f5e8b3ca4 Valid filenames have length limits! 
ext4 filenames are at most 255 bytes.  vfat filenames are bit more
lax, but we're often saving them on ext4 through a FUSE daemon, so
limit them the same way.

Since package names are used as directory names, verify that they're
valid filenames.

Tests to verify behavior.

Bug: 18689171
Change-Id: If7df4c40d352954510b71de4ff05d78259c721ed
 2015-06-11 19:16:27 -07:00
Dianne Hackborn
ece0f4f519 Fix APIs. 
Issue #21039494: API Review: android.os.PowerManager.isDeviceIdleMode()
Issue #21347000: API Review: android.content.IntentFilter
Issue #20654534: API Review: android.app.assist

Also allow use of ActivityManager.setWatchHeapLimit on any platform
build as long as the calling app is debuggable.

Change-Id: Ic597e596fa772fcdf2553b64f444b3d9269e8b92
 2015-06-11 18:07:43 -07:00
Jeff Sharkey
4d98bd0e3a am 03d3aefd: am a6f89a07: am c8488e99: Merge "Ignore some more generic USB device names." into mnc-dev 
* commit '03d3aefd3e0cc1b1cd1f43792ab9c3fc3bc9614c':
  Ignore some more generic USB device names.
 2015-06-11 21:24:39 +00:00
Jeff Sharkey
03d3aefd3e am a6f89a07: am c8488e99: Merge "Ignore some more generic USB device names." into mnc-dev 
* commit 'a6f89a07f191c8f80d7cbce62b178f8bdc23ec18':
  Ignore some more generic USB device names.
 2015-06-11 21:10:50 +00:00
Makoto Onuki
3a2255e957 am ed5d2dc2: am cc0c8a48: am bf2ccf94: Merge "Fix the PFD detachFd issue." into mnc-dev 
* commit 'ed5d2dc274e4a4b47816086653bf2d753c5ca115':
  Fix the PFD detachFd issue.
 2015-06-11 20:25:38 +00:00
Makoto Onuki
ed5d2dc274 am cc0c8a48: am bf2ccf94: Merge "Fix the PFD detachFd issue." into mnc-dev 
* commit 'cc0c8a48422e0bb5a1f699fdb12d12691004fe7c':
  Fix the PFD detachFd issue.
 2015-06-11 20:05:28 +00:00
Jeff Sharkey
c8488e99e8 Merge "Ignore some more generic USB device names." into mnc-dev 2015-06-11 19:57:25 +00:00