21418 Commits

Author SHA1 Message Date
Erik Kline
56d2e8fb7b am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
* commit '33cd463bbbbe47010ed44815fbfd0ab5e8fbf825':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
2014-12-10 07:36:35 +00:00
Erik Kline
33cd463bbb Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev 2014-12-10 07:29:47 +00:00
Wale Ogunwale
bfa6059b78 Always take an activity screenshot when pausing.
automerge: 37f2718

* commit '37f271869ed9c9e9f0e7de7339017e0bb6719780':
  Always take an activity screenshot when pausing.
2014-12-10 00:57:51 +00:00
Wale Ogunwale
37f271869e Always take an activity screenshot when pausing.
http://ag/261732 introduced an optimization where we only take
the activity screenshot if is is not the activity we took a
screenshot for last. This causes us to display a stale screenshot
for activities that change their display content (using fragments)
without going through the pause/resume cycle. It should be safe
to always take a screenshot when we are pausing since the code
path is only called once per pause/resume cycle.

Bug: 18682160
Change-Id: Ie5c43cfd806286808af4233c5917ae7071908ebb
(cherry picked from commit eacdf2ce04899b0a3abef55e4e7e1fe9c1649932)
2014-12-10 00:44:28 +00:00
Amith Yamasani
7acd8802d7 Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev
automerge: dad85a6

* commit 'dad85a6c4bf51c126978d584703a5320be7f396c':
  Allow user shutdown broadcasts to be delivered
2014-12-10 00:33:24 +00:00
Amith Yamasani
dad85a6c4b Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev 2014-12-10 00:30:31 +00:00
John Reck
fe11126d23 am 4f1942d9: Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev
* commit '4f1942d999c60fd91cb826651b6d978d47a74321':
  Teach AssetAtlas about more drawables
2014-12-09 23:18:08 +00:00
John Reck
4f1942d999 Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev 2014-12-09 23:12:42 +00:00
John Reck
dad7d84c04 Teach AssetAtlas about more drawables
Bug: 18317479

Change-Id: I16868ee204d24af72af9a2efc987f7e9eb1d266b
2014-12-09 14:18:33 -08:00
Amith Yamasani
0d2ebc2968 Allow user shutdown broadcasts to be delivered
Fixes a regression that prevents the user from being fully shutdown
after being stopped. Wasn't killing all user processes.

Bug: 7462778
Change-Id: Iee7231f7c8a167e8a61549b149294b2dbef071c1
2014-12-09 12:36:57 -08:00
Adrian Roos
87427ce503 am 456e6674: Merge "Revert "Fix calculation of overscan insets in WindowState."" into lmp-mr1-dev
* commit '456e66749191bc2b6f1acb69a2b86f499a6ca73a':
  Revert "Fix calculation of overscan insets in WindowState."
2014-12-09 18:42:56 +00:00
Adrian Roos
456e667491 Merge "Revert "Fix calculation of overscan insets in WindowState."" into lmp-mr1-dev 2014-12-09 18:34:53 +00:00
Jeff Sharkey
5d662a8289 am 2f4ced30: Merge "Consistent result when signatures don\'t match." into lmp-mr1-dev
* commit '2f4ced3009e1aa59f7b05a3663bc6ca6fe0a208e':
  Consistent result when signatures don't match.
2014-12-09 17:14:47 +00:00
Jeff Sharkey
2f4ced3009 Merge "Consistent result when signatures don't match." into lmp-mr1-dev 2014-12-09 17:10:12 +00:00
Adrian Roos
3236f3a93a Revert "Fix calculation of overscan insets in WindowState."
This reverts commit ff778fe450ca2d0e554aa6aee7a9da1cda46d4d5.

Bug: 18659737
Change-Id: I1efc59edfb8ded946cc14f5c4d6f532ac291bd81
2014-12-09 15:06:40 +00:00
Dianne Hackborn
beb84982a1 am 8b33cf4d: Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev
* commit '8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6':
  Work on issue #18640385: Add procstats test mode
2014-12-09 01:57:26 +00:00
Dianne Hackborn
8b33cf4d34 Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 2014-12-09 01:53:37 +00:00
Dianne Hackborn
1a4b5a4f02 Work on issue #18640385: Add procstats test mode
You can now do "adb shell dumpsys procstats --start-testing" to
enable high frequency pss sampling.

Also improved the low on RAM mem reporting to separate out RAM
from memtrack, in case the data we are getting from that is bad.

And fixed meminfo --oom to work correctly again.

Change-Id: I7af17eab110a82298bd7b0ce381f8fa5c96c1f6a
2014-12-08 17:43:31 -08:00
Jeff Sharkey
10bef1d2f4 Consistent result when signatures don't match.
INSTALL_FAILED_UPDATE_INCOMPATIBLE is a better description of the
real underlying cause when signatures don't match.

Bug: 18413784
Change-Id: Ib81591df7d0d79f6725a4fa7300ae4e20958f004
2014-12-08 16:41:04 -08:00
Santos Cordon
8dd185b08f am 5d2c1e69: (Telecom-system part 3) Adding Telecom Loader Service
* commit '5d2c1e69ecb851121177396ac376dee1fb41d421':
  (Telecom-system part 3) Adding Telecom Loader Service
2014-12-09 00:07:42 +00:00
Jeff Sharkey
2f1e953f8f am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev
* commit '4df65bf1eb454814954421403da9f8b5fcb82180':
  Direct notification of network interface changes.
2014-12-09 00:07:37 +00:00
Jinsuk Kim
19e53e9c55 am c414f466: Merge "CEC: Explictly remove and add device when updating" into lmp-mr1-dev
* commit 'c414f4665fdde510f39107f05d27e5bc3fca6e75':
  CEC: Explictly remove and add device when updating
2014-12-09 00:07:22 +00:00
Santos Cordon
5d2c1e69ec (Telecom-system part 3) Adding Telecom Loader Service
Bug: 18112269
Change-Id: I85ab03156bf906fdc72b459c4c68240ab3bf1894
2014-12-08 23:30:10 +00:00
Jeff Sharkey
4df65bf1eb Merge "Direct notification of network interface changes." into lmp-mr1-dev 2014-12-08 23:12:46 +00:00
Jeff Sharkey
6973634ce6 Direct notification of network interface changes.
Connectivity broadcasts recently changed and are no longer sent for
certain types of network changes.  For example, when stacked network
interfaces change for a mobile network.  To ensure that we pick up
all these details, directly wire the two services together.

Also remove some unused code for split network types.

Bug: 18666753
Change-Id: I0467bd5b330c0e0cb51af2306d821b41ad16337a
2014-12-08 14:50:14 -08:00
Jinsuk Kim
c414f4665f Merge "CEC: Explictly remove and add device when updating" into lmp-mr1-dev 2014-12-08 21:54:35 +00:00
Jinsuk Kim
4fcbf0b93e CEC: Explictly remove and add device when updating
Sending UPDATE_DEVICE doesn't translate remove/add devices
when its address (physical) has changed. Send expclit removal
addition event.

Bug: 18513567
Change-Id: Ibea6accf0358994b64289c1a785de21b598453f1
2014-12-09 06:48:13 +09:00
Jeff Sharkey
5b41696c56 am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
* commit 'a8fb580379b83b7fc76ee5b99149bbc8a2ce44ab':
  Offer to "merge" subscribers for data usage.
2014-12-08 18:04:02 +00:00
Jeff Sharkey
a8fb580379 Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 2014-12-08 17:57:16 +00:00
John Spurlock
20a46fb14f am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev
* commit '2ea3650d18ab0ce4dba2cee101d639400b411452':
  Zen: New behavior for built-in downtime + nextalarm conditions.
2014-12-08 16:52:49 +00:00
Jeff Sharkey
3256601f5e Offer to "merge" subscribers for data usage.
There are some cases where multiple subscriber identities (IMSI)
should be treated as "merged together" from a data usage
perspective.  This is done by extending the template used for
matching purposes to support multiple subscribers.

Then, when we query historical usage or set network policies, we
normalize the matching template to merge to any other identities
that should be included.  When normalizing, the "lowest" identity
is always used for equality and storage purposes, which allows
identities to come and go over time.

This change also fixes data usage recording for multi-SIM devices
by passing along the concrete subscriber identity for each network
interface.  Also correctly create default policies for multi-SIM
devices.  This change also drops setPolicyDataEnable() until it can
be wired up to the right underlying NetworkAgent.  (This means we
still bring up the network, and then rely on iptables rules to block
traffic when over the limit, instead of proactively disabling the
connection.)

Bug: 18012787
Change-Id: If6acf32009fdfea2b836f5aff8e2f3e5e0248b4a
2014-12-08 08:42:59 -08:00
John Spurlock
530052a2fe Zen: New behavior for built-in downtime + nextalarm conditions.
- Downtime: Allow user to enter downtime early, offer as an end
   condition four hours before downtime starts.  Available in
   either none or priority, regardless of settings configuration.
 - Downtime: Always exit before next alarm if zen=none.
 - Downtime: Make more like any other condition provider, remove
   special status (mostly).
 - Downtime: New auto-triggering rules, allow triggering after a
   manual condition ends, once.
 - Decouple NextAlarm + Downtime providers, allow them to offer
   their conditions at the same time.
 - Downtime/NextAlarm: Update conditions if they change while being
   requested, even if unsubscribed.
 - Make all three built-in condition providers optional, via config.
 - New internal helper for runtime config.
 - Don't follow changes to next alarm, consider the condition false.
 - Isolate downtime calendar logic into separate class (for testing).
 - Allow a:bb -> a:bb as a valid downtime range (all day).
 - Volume dialog: configuration establishes maximum number of visible
   conditions, including built-ins.
 - Zen mode panel: avoid widget updates during layout transition.
 - Zen mode panel: move controller callers to background thread.
 - Zen mode panel: hide/show/rebind rows instead of adding/removing.
 - ZenLog: Add downtime autotrigger results.
 - Volume panel: Smarter refresh on ringer/zen changes.

Bug: 16373455

Change-Id: I4f801018ddb0beb6eb9fa03a81c79f7949888a3f
2014-12-08 11:00:57 -05:00
Jinsuk Kim
33697d859f am 78a73577: Merge "CEC: Update CEC device info properly" into lmp-mr1-dev
* commit '78a7357787406220c4c2459f8d25a0175ac98347':
  CEC: Update CEC device info properly
2014-12-08 15:49:13 +00:00
Jinsuk Kim
6102bac706 CEC: Update CEC device info properly
CEC device information cannot be updated/notified properly if
the device was plugged to other port. This change makes
sure the updated information is reflected by device event
callback listeners.

Bug: 18513567
Change-Id: I62bbb741d3f89e225a50f86e315da014832d8118
2014-12-09 00:42:37 +09:00
Zoltan Szatmary-Ban
f5e44c29e8 am c5c93edd: Merge "When switching to default USB function set, check restriction" into lmp-mr1-dev
* commit 'c5c93edd9354e956d9b0a4d85fc8372907e2b011':
  When switching to default USB function set, check restriction
2014-12-08 12:55:54 +00:00
Zoltan Szatmary-Ban
c5c93edd93 Merge "When switching to default USB function set, check restriction" into lmp-mr1-dev 2014-12-08 12:50:25 +00:00
Jinsuk Kim
0cc53a5bae am 15556bbb: Merge "CEC: Disable debug logging" into lmp-mr1-dev
* commit '15556bbb4f873103f9bb911351389ee6c3295fea':
  CEC: Disable debug logging
2014-12-08 11:09:00 +00:00
Jinsuk Kim
15556bbb4f Merge "CEC: Disable debug logging" into lmp-mr1-dev 2014-12-08 11:02:30 +00:00
Jinsuk Kim
8e609fa657 CEC: Disable debug logging
Bug: 18471978
Change-Id: I2e229c5402d3d8f687414ec10f36f1d56505cdf9
2014-12-08 19:30:23 +09:00
Erik Kline
8f29dcfb53 Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
Since optimistic addresses are useable upon kernel notification
there is no need for this extra connectivity delay.

---

This functionality was originally submitted in ag/572619.  Owing
to issues with bind()ing to optimistic addresses (see b/18609055)
this was reverted in ag/598673.

This reverts the revert.  :-)

Bug: 17769720
Change-Id: Ibee490b2af72050693b6bd748193f51e312ca527
2014-12-08 16:25:20 +09:00
Wonsik Kim
14965d0ebb am 2abd2dd1: Merge "TIF: TvInputHardwareManager to listen to volume changes" into lmp-mr1-dev
* commit '2abd2dd1c3373a274cdccebf5af005065ee09dd0':
  TIF: TvInputHardwareManager to listen to volume changes
2014-12-07 13:37:29 +00:00
Wonsik Kim
2abd2dd1c3 Merge "TIF: TvInputHardwareManager to listen to volume changes" into lmp-mr1-dev 2014-12-07 13:00:50 +00:00
Jinsuk Kim
122e704a01 am 4da55388: Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev
* commit '4da553880930355cfbec1978657c9037f21a6edf':
  CEC: Avoid setting op in disabled mode
2014-12-06 10:27:00 +00:00
Jinsuk Kim
4da5538809 Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev 2014-12-06 10:19:57 +00:00
Wonsik Kim
49e5593532 TIF: TvInputHardwareManager to listen to volume changes
Bug: 18609977
Change-Id: Id3dac46aa4f8fac73125d39b1b74e3f7f24bb904
2014-12-06 14:20:38 +09:00
Jeff Davidson
386effc7a1 am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev
* commit 'f779e6b8ac827d923e3e7905045ad5c35512c535':
  Fix flipped captive portal bit in network conditions bcast.
2014-12-06 02:10:49 +00:00
Jeremy Joslin
c4b2ec1a3a am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev
* commit '1edc73aa5dc24db39ec685f1950c5110699e301e':
  Don't send the same PendingIntent more than once.
2014-12-06 02:10:33 +00:00
Jeff Davidson
f779e6b8ac Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev 2014-12-06 02:06:50 +00:00
Jeremy Joslin
1edc73aa5d Merge "Don't send the same PendingIntent more than once." into lmp-mr1-dev 2014-12-06 02:05:22 +00:00
Paul Jensen
a4afe13af3 am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev
* commit '891dd5743af17e3376b0b0438b149c565cf871c8':
  Reap unvalidated networks that have no chance of becoming highest scoring.
2014-12-06 01:31:32 +00:00