Dianne Hackborn
b570ded1ef
am 48453bf3: am 485d0b06: am 9c8600e1: Merge "Implement device idle in power manager." into mnc-dev
...
* commit '48453bf36dc03726ba82438531945b9b5d1771a1':
Implement device idle in power manager.
2015-05-11 22:51:36 +00:00
Dianne Hackborn
9c8600e1af
Merge "Implement device idle in power manager." into mnc-dev
2015-05-11 22:22:36 +00:00
Dianne Hackborn
8d66b3fbf5
Implement device idle in power manager.
...
When in device idle mode, we now prevent most apps
from being able to hold partial wake locks. The
device idle controller now pushes its white list of
app uids into the power manager, so it can apply this
policy correctly to only apps that are not whitelisted.
The implementation adds a new "disabled" flag to a wake
lock which is set when we want to apply this policy. When
set, we ensure that we tell battery stats that the wake lock
is not being held and ignore that wake lock when computing
the power state summary.
Also add new SDK APIs to schedule alarms that are allowed
to execute while in idle mode.
Finally add new dumpsys commands to the device idle controller
to completely disable and re-enable its operation, to use
for testing.
Change-Id: I1f16672c6ac06d03bb538f9854d5843db9aa6f27
2015-05-11 15:16:47 -07:00
Doris Liu
6c892be4f3
am f39708c3: am 803a1e84: am a2f04382: Merge "Use ArrayMap instead of HashMap for storing relavant nodes" into mnc-dev
...
* commit 'f39708c3e46006273411a0fb54a87fc23c697e77':
Use ArrayMap instead of HashMap for storing relavant nodes
2015-05-11 22:10:32 +00:00
Doris Liu
a2f043822b
Merge "Use ArrayMap instead of HashMap for storing relavant nodes" into mnc-dev
2015-05-11 21:31:42 +00:00
Doris Liu
d7444427d9
Use ArrayMap instead of HashMap for storing relavant nodes
...
This fix is to take advantage of ArrayMap, which is a key-value
mapping data structure that is more memory efficient than HashMap.
Bug: 11604254
Change-Id: I57006880de570a4d7f3899e274cf0a06355d116b
2015-05-11 13:23:31 -07:00
Adam Powell
2ddde23c50
am f003c792: am 44e89c49: am 5fccffd5: Merge "Bringing new Chooser UI closer to spec" into mnc-dev
...
* commit 'f003c7925692a22e9a4c0ad539f941cea886eb30':
Bringing new Chooser UI closer to spec
2015-05-11 19:40:21 +00:00
Adam Powell
5fccffd573
Merge "Bringing new Chooser UI closer to spec" into mnc-dev
2015-05-11 19:17:29 +00:00
Adam Powell
7d7580019e
Bringing new Chooser UI closer to spec
...
Separate the chooser targets into rows by type. Remove some API that
was redundant with LabeledIntent, simplifying ChooserTarget.
Change-Id: I90de471825f05d85e6ffbe72a32fb597be824a30
2015-05-11 12:16:19 -07:00
Chirag Shah
a03934ce95
am d0a15765: am 23c0fca3: am 3ce72722: Merge "Revert the AssistAction class." into mnc-dev
...
* commit 'd0a15765eb81c5d065ddd83f16b6c2c0791677e1':
Revert the AssistAction class.
2015-05-11 18:21:00 +00:00
George Mount
79fcf9e194
am 42240e1f: am 96f1d461: am 3dec0d47: Merge "Disable input during Activity Transition." into mnc-dev
...
* commit '42240e1fe20d5e3dfd8a704eee8a200d98c0212f':
Disable input during Activity Transition.
2015-05-11 17:55:58 +00:00
Chirag Shah
3ce72722ca
Merge "Revert the AssistAction class." into mnc-dev
2015-05-11 17:39:49 +00:00
George Mount
3dec0d4721
Merge "Disable input during Activity Transition." into mnc-dev
2015-05-11 17:19:03 +00:00
Amith Yamasani
550b4e9a1f
am ec2f3d50: am db8d9ea0: am a5b2684c: Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev
...
* commit 'ec2f3d50124e51bd9915b4fc0cf28f82a10495a4':
Rename *AppIdle to *AppInactive per api-council
2015-05-11 16:46:03 +00:00
Paul McLean
92940e95e7
am 9feba6e7: am 7238cdc3: am 1c82b221: Merge "Changes as per API council review." into mnc-dev
...
* commit '9feba6e7744d5235f81fc9e5be0e8f3d149ad599':
Changes as per API council review.
2015-05-11 16:12:41 +00:00
Amith Yamasani
a5b2684c25
Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev
2015-05-11 16:11:14 +00:00
Paul McLean
1c82b221d4
Merge "Changes as per API council review." into mnc-dev
2015-05-11 15:39:29 +00:00
Nick Kralevich
03db3f99cc
am 0ca72da6: am f1a904fd: am d9c7f245: UsbManager / UsbService / UsbDeviceManager: delete unused code
...
* commit '0ca72da655d50b0ba5fda49560b8ba15325c225f':
UsbManager / UsbService / UsbDeviceManager: delete unused code
2015-05-11 05:45:08 +00:00
Nick Kralevich
d9c7f24569
UsbManager / UsbService / UsbDeviceManager: delete unused code
...
These functions are never called.
Change-Id: Ic436e1036bed717d2c64701fddd9a810abb9443e
2015-05-10 21:57:56 -07:00
Jeff Sharkey
69fe6b50d2
am 10b247e6: am 6221dae2: am fced534d: Fix devices with primary physical storage.
...
* commit '10b247e6d5d375398e9c1f824933b86022e9d751':
Fix devices with primary physical storage.
2015-05-10 22:31:25 +00:00
Jeff Sharkey
fced534dec
Fix devices with primary physical storage.
...
Always assume the factory-reset default primary storage before parsing
storage settings. Without this, we'd always default to picking
internal emulated storage during first boot or upgrade.
Bump version code to re-evaluate this for devices that default to
physical storage as primary.
Also restrict available move targets when storage is physical, since
we can't really translate between multi-user and non-multi-user aware
storage.
Bug: 20836019
Change-Id: I186ded1aa3dd9cea67497a4f53b0973031174ccd
2015-05-10 14:53:37 -07:00
Alan Viverette
1c9c4b2967
am 155a9aef: am 98c664a9: am f659a56c: Merge "Replace usages of deprecated version of TextView.setTextAppearance()" into mnc-dev
...
* commit '155a9aef7f1a9edf25398e9630023d68f5354353':
Replace usages of deprecated version of TextView.setTextAppearance()
2015-05-09 00:52:08 +00:00
Fyodor Kupolov
b1910fd37b
am 31dfbcbb: am 9e175200: am 220eef4a: Merge "Disable multi-user background recording" into mnc-dev
...
* commit '31dfbcbb973b91828c6fb9d2e47919716b9fbbfd':
Disable multi-user background recording
2015-05-09 00:52:03 +00:00
Alan Viverette
f659a56c30
Merge "Replace usages of deprecated version of TextView.setTextAppearance()" into mnc-dev
2015-05-09 00:20:04 +00:00
Alan Viverette
bb98ebd6b1
Replace usages of deprecated version of TextView.setTextAppearance()
...
Change-Id: Ie501affe2e3a275d3172ce8ed584ba1cd5494da8
2015-05-08 17:17:44 -07:00
Fyodor Kupolov
b501330a1b
Disable multi-user background recording
...
On user switch, kill existing processes of the background user with
android.permission.RECORD_AUDIO permission. Home activity should not be
killed to avoid an expensive restart of the home launcher, when the
user switches back.
Introduced DISALLOW_RECORD_AUDIO user restriction, which is enabled for the
background user, and removed for the foreground user.
Introduced a concept of system controlled user restriction, which can only
be set by the system, rather than device administrator.
Bug: 20346194
Change-Id: Ic942fd565e80d14424230dae612965a8e229c4ef
2015-05-08 17:17:16 -07:00
Fyodor Kupolov
a39b5ff076
am 8bc22f52: am 85dbc345: am 4f434a04: Merge "Remove restrictions PIN functionality" into mnc-dev
...
* commit '8bc22f521872d64af1c61c1d0845ae562cc5cb8f':
Remove restrictions PIN functionality
2015-05-08 23:42:34 +00:00
Fyodor Kupolov
4f434a0470
Merge "Remove restrictions PIN functionality" into mnc-dev
2015-05-08 23:10:31 +00:00
Paul McLean
e3383cc453
Changes as per API council review.
...
Bug: 20887665
Change-Id: I1da7a2c69d8cf20682c767294b1647beef33f90c
2015-05-08 15:55:18 -07:00
John Spurlock
4a86635c6c
am d60c7431: am 022ed34c: am 4755cb3e: Merge "Zen: Tweak default automatic rules." into mnc-dev
...
* commit 'd60c74312e9091f2378bd582dfd56e4b53cdb8cd':
Zen: Tweak default automatic rules.
2015-05-08 22:53:36 +00:00
John Spurlock
35686d9bff
am 22b5f2ac: am a7b4cc0d: am d89a6b2a: Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-dev
...
* commit '22b5f2ac11e769315fa47915217fe546e467cab5':
Zen: Simplify notification policy api, add zenmode api.
2015-05-08 22:53:29 +00:00
Craig Lafayette
f9c256e7d7
am 211a6d93: am 98950e44: am ed1ef7d4: Merge "DeviceInitializerStatus API review changes" into mnc-dev
...
* commit '211a6d93f027050239e9937cbc463877fce2e016':
DeviceInitializerStatus API review changes
2015-05-08 22:30:14 +00:00
Chad Brubaker
54aa83d3e9
am dcf8c5eb: am 47814acc: am f8a96d16: Merge "Cleanup keystore password changing and unlocking" into mnc-dev
...
* commit 'dcf8c5eb6c479b7d29f98bd8401b7183e65b7a13':
Cleanup keystore password changing and unlocking
2015-05-08 22:30:04 +00:00
Mady Mellor
f01b6562ec
am 435bbcaf: am e2698b7d: am db9629ee: Merge "Fix: Hard to modify multi-line selection." into mnc-dev
...
* commit '435bbcaf2c08add8ebc26e4d70f44ad28037cfea':
Fix: Hard to modify multi-line selection.
2015-05-08 22:29:57 +00:00
John Spurlock
4755cb3e5d
Merge "Zen: Tweak default automatic rules." into mnc-dev
2015-05-08 22:29:12 +00:00
John Spurlock
d89a6b2abc
Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-dev
2015-05-08 22:28:51 +00:00
Craig Lafayette
ed1ef7d4eb
Merge "DeviceInitializerStatus API review changes" into mnc-dev
2015-05-08 22:12:58 +00:00
Chad Brubaker
f8a96d1629
Merge "Cleanup keystore password changing and unlocking" into mnc-dev
2015-05-08 21:51:25 +00:00
Richard Uhler
6dff55cd21
am 07084f1c: am dd4f57bb: am 26211059: Merge "Add \'App Summary\' section to meminfo." into mnc-dev
...
* commit '07084f1c7dde4654433aba8efc86a75c5c115dd2':
Add 'App Summary' section to meminfo.
2015-05-08 21:47:56 +00:00
Glenn Kasten
e12c0c310a
am a97439cb: am 3b6f0e53: am d7b69c2e: Merge "Add feature for pro audio" into mnc-dev
...
* commit 'a97439cb8802499a48265e6aa690b7c6c3642154':
Add feature for pro audio
2015-05-08 21:47:51 +00:00
Alan Viverette
c1306ec7ab
am 829410a4: am 4db1aca5: am f93bba5b: Merge "Allow ContextImpl.setTheme(int) to be called after getTheme()" into mnc-dev
...
* commit '829410a4c3af11f99f33d4d367a2d87199f0a8e6':
Allow ContextImpl.setTheme(int) to be called after getTheme()
2015-05-08 21:47:46 +00:00
Mady Mellor
db9629eec4
Merge "Fix: Hard to modify multi-line selection." into mnc-dev
2015-05-08 21:45:36 +00:00
John Spurlock
cb9aa20bdd
Zen: Tweak default automatic rules.
...
- Add a new default rule for calendar events.
- Rename all default rules to singular form. i.e. Weekend/Weeknight/Event
Bug: 20064962
Change-Id: Iee13238e0479fd2a05abdef4a5584455dcdd0c53
2015-05-08 17:35:22 -04:00
Dianne Hackborn
cc1b7d06dc
am a0f5356f: am 396345ca: am ed9af066: Merge "Fix issue #20655182 : API Review: ViewAssistStructure" into mnc-dev
...
* commit 'a0f5356fdc84f5bf05677ae773bf168dc5349b7c':
Fix issue #20655182 : API Review: ViewAssistStructure
2015-05-08 21:14:38 +00:00
Richard Uhler
262110591e
Merge "Add 'App Summary' section to meminfo." into mnc-dev
2015-05-08 21:11:45 +00:00
Glenn Kasten
d7b69c2eca
Merge "Add feature for pro audio" into mnc-dev
2015-05-08 21:11:08 +00:00
Alan Viverette
f93bba5b79
Merge "Allow ContextImpl.setTheme(int) to be called after getTheme()" into mnc-dev
2015-05-08 21:10:03 +00:00
George Mount
2898b77ab1
am 17d085a9: am b9deb734: am 180fd278: Merge "Don\'t call updateDisplayListIfDirty outside draw." into mnc-dev
...
* commit '17d085a94ce3d3694e2705b6eeb646e671055fa8':
Don't call updateDisplayListIfDirty outside draw.
2015-05-08 21:01:29 +00:00
Chirag Shah
34cab7ca61
Revert the AssistAction class.
...
Bug 20654534
Change-Id: Ia85e7ebe2b8b168d0f9100e5006160ac969a296d
2015-05-08 20:44:12 +00:00
Dianne Hackborn
ed9af066b2
Merge "Fix issue #20655182 : API Review: ViewAssistStructure" into mnc-dev
2015-05-08 20:42:12 +00:00