381 Commits

Author SHA1 Message Date
Dianne Hackborn
c9519fcd38 am 32a9180a: am f29a4981: am d4981014: am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit '32a9180a6c1ac12503aaf0d123c2bfff73349508':
  Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
2014-03-14 17:53:30 +00:00
Dianne Hackborn
f29a498161 am d4981014: am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit 'd4981014d486c3ff72813d0d37048ee2abdb3d63':
  Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
2014-03-14 16:32:02 +00:00
Dianne Hackborn
d4981014d4 am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit 'e5191aabff5b9b751349b8634836a858af744905':
  Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
2014-03-14 16:27:40 +00:00
Dave Platt
6b2b14028d am cb1254f1: am e4e6b3cc: am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit 'cb1254f1abc44b82e2a9da0d9a73230eb46e129e':
  NsdService does not clean up after exiting clients
2014-03-14 13:13:38 +00:00
Dave Platt
e4e6b3cc19 am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit '21384faa2b3da619a54b35f15936c00593b30694':
  NsdService does not clean up after exiting clients
2014-03-13 23:42:03 +00:00
Brian Carlstrom
00d115a753 resolved conflicts for merge of aa737c49 to klp-modular-dev-plus-aosp
Change-Id: I1f4e555773fe6138efaf73444525da0f747b01d5
2014-03-13 16:35:09 -07:00
John Spurlock
57392e14cd Merge "Add more information to existing notification_* events." 2014-03-13 21:26:35 +00:00
Chad Brubaker
48dd8b0fc0 am 74f99a4e: am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '74f99a4e904af56a62f86b81831c23c763b6001e':
  Only allow System apps to make VPN exempt routes
2014-03-13 18:23:00 +00:00
Chad Brubaker
7f68f7f4a1 am f5729a6a: am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit 'f5729a6a1573ba27f69a5c5dc144be3f8f60b026':
  Add the calling package name to requestRouteToHost
2014-03-13 18:22:57 +00:00
Narayan Kamath
aa737c49df am 9af19bee: am 52af2ca9: DO NOT MERGE - Remove data dirs if a new install fails dexopt.
* commit '9af19bee1c7da8d2e8bc6e40c6e9c1e28e0640c6':
  DO NOT MERGE - Remove data dirs if a new install fails dexopt.
2014-03-13 18:18:48 +00:00
Chad Brubaker
74f99a4e90 am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '7fb074389370ac93afc5830189371dc3ec26265c':
  Only allow System apps to make VPN exempt routes
2014-03-13 18:18:40 +00:00
Chad Brubaker
f5729a6a15 am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '1011960c44a4f84d53d05199fe1ca09be9473822':
  Add the calling package name to requestRouteToHost
2014-03-13 18:18:36 +00:00
John Spurlock
e6a7d93420 Add more information to existing notification_* events.
Include calling UID/PID in the existing
notification_{enqueue/cancel/cancel_all} event logs.

Include a new "reason" arg for cancel + cancel_all to
identify listener vs noman vs statusbarmgr calls.

Found and fixed a cancelAll path (from statusbarmgr)
that was not logging at all.

Bug:13442201
Change-Id: I2e1f875076a96b1fe3b86e8990641efb1cadfcfb
2014-03-13 14:18:18 -04:00
Craig Mautner
aea74a5977 Add Lock Task Mode.
When in lock task mode only the specified task may run. All
attempts to switch to another task are ignored until the task
finishes or a call to stopLockTaskMode() is made.

Change-Id: I6cfe92fe1bcf22cd47b5398c08e23c52a4092dda
2014-03-13 11:09:13 -07:00
Dianne Hackborn
08fc3a7fc2 Merge "Fix some uid issues in battery stats." 2014-03-13 17:04:54 +00:00
Dianne Hackborn
bbb7472b8e Fix some uid issues in battery stats.
Change-Id: I9f7773568ff12603d51b26d50d758add09bedbb2
2014-03-13 09:50:24 -07:00
Kenny Guy
4979ff9f28 Merge "Show notifications from related users." 2014-03-13 11:57:55 +00:00
Alexandra Gherghina
aaebbbff73 Merge "Check for empty activity stack. This avoids a null pointer exception when switching from an user with no open apps." 2014-03-13 09:31:53 +00:00
Alexandra Gherghina
dae57a1414 Check for empty activity stack. This avoids a null pointer exception
when switching from an user with no open apps.

Change-Id: I02629818f2bc82ee3a2825cf484ef1e32e3e6067
2014-03-13 08:55:56 +00:00
Jeff Brown
088a997def am 81cc19cf: am 236e174a: am 0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
* commit '81cc19cf18dff969319c7d1ded4f285394e37aab':
  Add a temporary hack to report screen on while dozing.
2014-03-12 22:57:52 +00:00
RoboErik
4224e83642 Merge "Adds a TransportController and TransportPerformer to session" 2014-03-12 22:14:50 +00:00
RoboErik
8ae0f34db9 Adds a TransportController and TransportPerformer to session
This makes transport controls a primitive interface on sessions with
a way to create the performer, register callbacks, and send commands
and updates between controllers and performers. This still needs some
cleanup but has been tested with OneMedia.

Change-Id: I373d35f7ccc383b8421bd14044457467d80425f3
2014-03-12 15:09:42 -07:00
RoboErik
306c46884e am ca9eef62: b/12068020 Make kb layouts only unique to vendor/product. Do not merge
* commit 'ca9eef6203b7cfb0084f8305d4dcc5d70a7a25cd':
  b/12068020 Make kb layouts only unique to vendor/product. Do not merge
2014-03-12 21:12:26 +00:00
Jeff Brown
141d889166 am 578e1938: am 3ce589e5: am 2d8a3908: Fix power manager display wake lock bugs.
* commit '578e19381c2329511187083045d3ad5509428730':
  Fix power manager display wake lock bugs.
2014-03-12 20:34:48 +00:00
RoboErik
ca9eef6203 b/12068020 Make kb layouts only unique to vendor/product. Do not merge
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/399886/

Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.

There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.

Change-Id: I1f2508561992080459310d5a644dad65a9c24f1a
2014-03-12 13:21:08 -07:00
Kenny Guy
3a7c4a5669 Show notifications from related users.
When filtering notifications for user include those for users that
are related to the current user.
Pipe through user id so we know which user the notification is for.

Change-Id: I4e2657c23bd7b611d450be5a1f9457824bc062cb
2014-03-12 19:51:03 +00:00
Jeff Brown
236e174a96 am 0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
* commit '0575b185c618a79ede771389ed9a78436b5636bd':
  Add a temporary hack to report screen on while dozing.
2014-03-12 19:19:12 +00:00
Jeff Brown
0575b185c6 Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev 2014-03-12 19:16:42 +00:00
Jeff Brown
3ce589e595 am 2d8a3908: Fix power manager display wake lock bugs.
* commit '2d8a3908d2b0a74ccdecd97e86e7bfda1caa218e':
  Fix power manager display wake lock bugs.
2014-03-12 08:57:51 +00:00
Jeff Brown
2d8a3908d2 Fix power manager display wake lock bugs.
Under certain circumstances, the power manager might continue to
hold the display wakelock long after the display had been turned
off due to the mDisplayReady flag having an incorrect value.

1. An inverted conditional caused DisplayPowerState to incorrectly
signal the screen on ready state.

2. The DisplayPowerController failed to clear the block screen on
flag in the case where the screen was turned off before it became
unblocked from turning on.  This could happen when the display was
rapidly turned on-off-on-off.

Bug: 13248135
Change-Id: I8faa3034695c83c8cd35613d81acccf40d22128d
2014-03-11 23:23:58 -07:00
Jeff Brown
e39ef09896 Add a temporary hack to report screen on while dozing.
The window manager and view hierarchy currently disable all drawing
when PowerManager.isScreenOn() returns false so no drawing occurs
while dozing.  This will be fixed in a future patch to take the
display blanking state into account correctly.

This patch is a workaround to unblock development in the meantime.

Bug: 13133142
Change-Id: I2dc0b422c77285e657d73adca2606aa68264d987
2014-03-11 20:56:26 -07:00
Dianne Hackborn
5c71949572 Merge "Reduce wake lock noise in battery history." 2014-03-11 22:59:21 +00:00
Robert Greenwalt
ee142967f6 am e5098b50: am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
* commit 'e5098b502c28d8f40ff3b39070fc5fb7f1a3e445':
  DO NOT MERGE Debounce wifi country code Info
2014-03-11 19:19:07 +00:00
Vinit Deshapnde
dbba6f0769 am 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '2e76f5d8a282f4f948f88208e77dc4b3d0ec6634':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
2014-03-11 19:19:02 +00:00
Winson Chung
303e1ff1fe Initial changes for recents.
Change-Id: Ide2c202b4a5b25410f0f32bd0a81ccf817ede38f
2014-03-11 12:03:08 -07:00
Robert Greenwalt
e5098b502c am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
* commit 'e8af5e10e04697acb26b47e5d60b99e5c61a020c':
  DO NOT MERGE Debounce wifi country code Info
2014-03-11 17:44:20 +00:00
Vinit Deshapnde
2e76f5d8a2 am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '5f683ca80611c3e98c91f631ee05dccf3e7e0227':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
2014-03-11 17:43:50 +00:00
Dianne Hackborn
e5167ca61e Reduce wake lock noise in battery history.
When the work source of a wake lock was changed, this would
cause the old wake lock to be released in battery stats before
the new one was acquired (the power manager would correctly
keep holding the associated wake lock).  This resulted in a
pointless entry in the battery history showing the last wake
lock being released and a new one acquired.

This change adds a new path in to battery stats to report
when a wake lock has changed, allowing it to acquire the
new wake locks first before the old ones, so it can't drop
down to zero wake locks.  This also provides better timing
information, as the same current time can be used for both
operations.

In addition, added a new kind of history entry for the
current time, so you can tell when in actual world clock
time the battery data is happening.

Change-Id: Ibbf2eed83bb93f31f60267889b7bc5b9e71e355f
2014-03-11 10:02:40 -07:00
Jason Gerecke
d522074232 Support unique calibration per orientation
Updates the format of the calibration XML to store the Surface rotation
that a specific calibration applies to. Also updates the API to require
a rotation value for get/set, and has the native framework supply this
according to the current rotation whenever it changes.

Change-Id: I72b6703f646dd18db537365c5c9843f720a5f41e
2014-03-10 16:33:48 -07:00
Jason Gerecke
857aa7be88 Initialize mAffineTransform and update on modification
This patch causes the InputReader to update its mAffineTransform to reflect
the currently-set calibration on startup and whenever its value is changed
through the InputManagerService.

Change-Id: I81c76e8cf168728ee140abaf148e1cd31687d5af
2014-03-10 15:54:21 -07:00
Jason Gerecke
d6396d6720 Allow persistence of input device calibration
This patch extends the PersistentDataStore store to read and write
input device calibration data. A new SET_INPUT_CALIBRATION permission
grants apps the ability to update this information, and a new
TouchCalibration class is used to wrap the raw calibration data.

Change-Id: I4daac2b15ef03616ea5b068c1e77bebd0ce7b8c1
2014-03-10 15:54:21 -07:00
Amith Yamasani
724cc1f04f Merge "Allow related users to show activities on primary user" 2014-03-10 21:36:25 +00:00
Paul Lawrence
2bc6857532 Merge "Clean up a few minor issues" 2014-03-10 16:41:22 +00:00
Selim Cinek
eb7bd8bbc3 Merge "Fixed a bug where the current wallpaper could be reset on an update" 2014-03-10 16:07:11 +00:00
Dave Allison
2d3ddc2ba9 am 199670c4: am 324aa693: am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."
* commit '199670c46a9950bd2e06af43ea082427b542060a':
  ART profiler usage.
2014-03-08 07:26:41 +00:00
Dave Allison
324aa693b8 am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."
* commit 'b94904ab6dfbb9db7e8042f10886042a295857d4':
  ART profiler usage.
2014-03-08 01:56:29 +00:00
Amith Yamasani
734983fff3 Allow related users to show activities on primary user
Make ActivityManager and WindowManager understand related users.

Task stack will now contain interleaved tasks for related users,
but still group regular users separately from groups of related users.

InputMethodManagerService permits related users to invoke IME and receive
key events.

Change-Id: I3bd87b32aec69c3f8d470c8b29b144f4e849c808
2014-03-07 17:41:24 -08:00
Dianne Hackborn
c51cf03cf2 Start recording wakeup reasons in battery history.
Depends on a modification to libsuspend so that we can get
a callback each time the device wakes up, to read the current
wakeup reasons from the kernel.  These are then stuffed in
to a new field in the battery history.

Also add new dump options --history-start and --charged
to better control what is dumped.

Finally the alarm manager uses a "*walarm*" tag for history
item wake locks that are coming from a wakeup alarm.

Change-Id: I457571973d5b2b5fdc4e4b63ab16275db20d7edd
2014-03-07 15:18:45 -08:00
Narayan Kamath
ca35c18a37 am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes."
* commit 'cd4874cfdc00d17454529b5dca85a487c7c2de77':
  Inform libcore of time format pref. changes.
2014-03-07 16:11:29 +00:00
Narayan Kamath
f084e2779b Merge "Inform libcore of time format pref. changes." 2014-03-07 14:02:19 +00:00