24100 Commits

Author SHA1 Message Date
Fyodor Kupolov
d483a85e69 am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev
* commit 'fed2812dc9fd717a7e3b1ebf9c602eda2bdfca08':
  Added isRemovingAdmin method
2014-12-08 19:16:12 +00:00
Amith Yamasani
81b27f4c9f am b2905092: am 0702752c: Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev
* commit 'b2905092d6779349834635c6343556017c0c998e':
  Potential fix for accidental deactivation of profile owner
2014-12-08 19:15:50 +00:00
Benjamin Franz
f4a76651b0 am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev
* commit '5f1ea2e68b138316f2a56d0a1de382ac47f7b11c':
  Change the routing path of bluetooth headset connections.
2014-12-08 19:14:56 +00:00
Dongwon Kang
6077acaf14 am bfc9739b: am 9e094efa: Merge "TIF: handle a race condition when a session is crashed" into lmp-mr1-dev
* commit 'bfc9739b1c1d57f388a8be62e99f3592f08ad9b3':
  TIF: handle a race condition when a session is crashed
2014-12-08 19:14:20 +00:00
Filip Gruszczynski
5ae61a811a am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev
* commit 'f5d1cf0b194147fae0aca2c2352b4843627ffc1e':
  Private Window flag to disable touch events in WallpaperService.
2014-12-08 19:13:39 +00:00
Dianne Hackborn
34e7003a78 am 3cb6496b: am 25d2c2d6: Merge "Fix issue #18593636: Turn on "kill important processes that..." into lmp-mr1-dev
* commit '3cb6496b6c8bb48d458c46e7a062228f0488307d':
  Fix issue #18593636: Turn on "kill important processes that...
2014-12-08 19:12:47 +00:00
Svetoslav
f477aeb367 am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched.
* commit 'ed068f7c3047b3775647a6023c6960a4fc535144':
  Ensure all events from a showing window are dispatched.
2014-12-08 19:12:22 +00:00
Jinsuk Kim
3f771d879c am d1133ba8: am 60747974: Merge "CEC: Introduce the retry for commands on the new device discovery." into lmp-mr1-dev
* commit 'd1133ba8855199b34c22b369f34c987a14c68b85':
  CEC: Introduce the retry for commands on the new device discovery.
2014-12-08 19:11:58 +00:00
Mike Lockwood
210d9d94cf Merge "MIDI Manager work in progress" 2014-12-08 18:46:38 +00:00
Mike Lockwood
67f8e8bd89 MIDI Manager work in progress
Still to do:

Add MidiInputPort and MidiOutputPort classes
Schedule sending MIDI events in the future
Security/permissions
Reconsider interface for virtual devices
Look into performance optimizations

Change-Id: I9b7d63b196996a04be0a830efa913043da1328a8
2014-12-08 10:45:37 -08: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
Paul Jensen
891dd5743a Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev 2014-12-06 01:23:56 +00:00
Jeff Davidson
f9fff92d70 Fix flipped captive portal bit in network conditions bcast.
Bug: 18651036
Change-Id: I191fcafab1fc5ba65be06359da1edc7ca5aabc6a
2014-12-05 16:56:08 -08:00
Bernhard Rosenkränzer
46c82b4cd2 Adjust format strings to work on both 32-bit and 64-bit builds
Adjust format strings to not produce Clang warnings in both 32-bit and
64-bit builds

Change-Id: I76c29d8d5d0fb4b5e9d9518077652370ffe9e871
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-12-05 16:14:07 -08:00
RoboErik
2d7a1b09e9 am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev
* commit 'd386d0f391c41e3e6e87abab44600df24f45ac4a':
  Route mute key events through MediaSessionService
2014-12-05 23:23:59 +00:00
RoboErik
d386d0f391 Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev 2014-12-05 23:16:41 +00:00
Wale Ogunwale
80d119121f am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behind early." into lmp-mr1-dev
* commit 'b503e3f2872636b450d950b5792fdb569d87819c':
  Don't destroy surfaces of activities launched behind early.
2014-12-05 23:01:11 +00:00
Filip Gruszczynski
91a5dd9b43 am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev
* commit 'e6a2ff2b1f7a2241350347fd0f12ffccc1391649':
  Fix calculation of overscan insets in WindowState.
2014-12-05 23:01:06 +00:00
Dianne Hackborn
e52a2ea03b am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev
* commit '0029f0ac36c28b60d59d3d70d148ba3136971b95':
  Fix issue #17323751: Additional items in aggregated battery stats
2014-12-05 23:01:01 +00:00
Jeremy Joslin
7929484dbf Don't send the same PendingIntent more than once.
Fixing a bug where a NetworkRequest's PendingIntent can be sent more
than once when networks are rematched before the intent completes.

Added a small delay before removing the request to give the receiving
client an opportunity to put in its own request. The delay value is
configurable via Settings.Secure.

Bug: 18614074
Change-Id: Iac7c5e5a04f42f2b6794e9e22349cc631bebeab7
2014-12-05 14:58:04 -08:00
Wale Ogunwale
b503e3f287 Merge "Don't destroy surfaces of activities launched behind early." into lmp-mr1-dev 2014-12-05 22:56:13 +00:00
Filip Gruszczynski
e6a2ff2b1f Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev 2014-12-05 22:56:00 +00:00
Dianne Hackborn
0029f0ac36 Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev 2014-12-05 22:54:08 +00:00
Wale Ogunwale
ec533f6a55 Don't destroy surfaces of activities launched behind early.
When the launch activity behind feature was introduced in
http://ag/502868, we destroy the surfaces of windows associated with
the activity early in the last app window animation step. The causes
issues with activities that might be using the surface and not
prepared to have the surface destroyed from underneath them. We now
let the surface destruction get handled like any other window so all
the components/processes interested in the surface can be in the
right state when the surface is destroyed.

Bug: 18325222
Change-Id: I45e834a07a199b8a9e364f7392db99c871a43280
2014-12-05 14:52:04 -08:00
Dianne Hackborn
1e01d16982 Fix issue #17323751: Additional items in aggregated battery stats
- Now aggregate number of times each process has crashed and ANRed.
- Now aggregate total number of connectivity changes.
- Now record connectivity changes in the history.

Crash and ANR counts are new entries at the end of "pr" in checkin.

Connectivity change counts is a new entry at the end of "m" in checkin.

Connectivity changes in the history checkin are Ecn and include the
type of connection and its state.

Change-Id: I0c01186446034cf6c3fb97d45f5e3b5c69a0438a
2014-12-05 13:54:24 -08:00
Wale Ogunwale
ea3c7df59a am af3361bb: am 9a3f6ac6: am 6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev
* commit 'af3361bb264d9d037f0bd10532a752bbaeaec39c':
  Add support from restoring recent's backup.
2014-12-05 21:49:31 +00:00
Craig Mautner
e51d9008bd am 00454026: am 1d8b27bc: am 1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev
* commit '004540260c02222fe2c611823c428e02b4a8a135':
  [ActivityManager] Fix NPE when start activity
2014-12-05 21:48:45 +00:00
Wale Ogunwale
af3361bb26 am 9a3f6ac6: am 6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev
* commit '9a3f6ac63c9c11008b6dbb99d5213b3d3f51fca0':
  Add support from restoring recent's backup.
2014-12-05 21:41:03 +00:00