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
Jeff Sharkey
47b872d9c3
Ignore some more generic USB device names.
...
Bug: 21376386
Change-Id: I8c1b1cf9d881ad2795e9b15740ff511260572f1b
2015-06-11 12:54:42 -07:00
Makoto Onuki
b30ad6f5e8
Fix the PFD detachFd issue.
...
Bug 18566244
Change-Id: I410b2219e08c9108236e2c2926bd613315198703
2015-06-11 12:34:22 -07:00
Svetoslav
3c0e6d9ebf
am 47db7221: am 0525c07f: am 75a0ee08: Merge "Add system API to watch for permission changes" into mnc-dev
...
* commit '47db7221685aaa12926abc42198069c733491cfc':
Add system API to watch for permission changes
2015-06-11 17:07:05 +00:00
Svetoslav
47db722168
am 0525c07f: am 75a0ee08: Merge "Add system API to watch for permission changes" into mnc-dev
...
* commit '0525c07f30f08008883cf2845afa3bf81f888c55':
Add system API to watch for permission changes
2015-06-11 12:53:42 +00:00
Svetoslav
75a0ee081f
Merge "Add system API to watch for permission changes" into mnc-dev
2015-06-11 08:02:06 +00:00
Svetoslav
f7c06eb03a
Add system API to watch for permission changes
...
Change-Id: I1ce450a59fb326c14848f46732d877dea33f33c7
2015-06-10 21:24:13 -07:00
Jeff Sharkey
9c9661f1b7
am 51b055d3: am e1844c83: am 5fc24733: New strings!
...
* commit '51b055d330279f5d0a38ad1c33540189e71356e8':
New strings!
2015-06-11 02:34:28 +00:00
Jeff Sharkey
51b055d330
am e1844c83: am 5fc24733: New strings!
...
* commit 'e1844c8302c57e231b85b2fb3cb59fb7f569a270':
New strings!
2015-06-11 01:51:09 +00:00
Adam Lesinski
b39a20e8df
am 5b02907c: am 9702b5d9: am 3d53a26d: Merge "Add more blaming output to batterystats dumpsys" into mnc-dev
...
* commit '5b02907c9779028cbc60db153fa5f0819155680b':
Add more blaming output to batterystats dumpsys
2015-06-11 01:31:46 +00:00
Jeff Sharkey
5fc247338d
New strings!
...
Bug: 21737573, 21666225, 21756698, 21737666, 21471429
Change-Id: If1c5882d48f798d311f6d2b86277d3c13f06824e
2015-06-10 16:49:11 -07:00
Adam Lesinski
5b02907c97
am 9702b5d9: am 3d53a26d: Merge "Add more blaming output to batterystats dumpsys" into mnc-dev
...
* commit '9702b5d98824df4fafce821ce9fe15907586b9b1':
Add more blaming output to batterystats dumpsys
2015-06-10 23:15:25 +00:00
Adam Lesinski
628ef9cbed
Add more blaming output to batterystats dumpsys
...
Change-Id: I3216f13f16d89a72617d54638df43ce39183da9e
2015-06-10 13:08:57 -07:00