21000 Commits

Author SHA1 Message Date
Kenny Guy
867a2acda9 am 19acab1f: Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev
* commit '19acab1f8b24cb4265ed591fbec02ea13402d96a':
  Ignore badly formed ComponentNames when loading device_owner.xml
2014-09-25 16:52:29 +00:00
Kenny Guy
baa05930ec Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev 2014-09-25 16:42:11 +00:00
Kenny Guy
be16357f40 Ignore badly formed ComponentNames when loading device_owner.xml
In the past we wrote out badly formed ComponentNames with no
class part. Loading these results in a null pointer exception
blocking boot.

Bug: 17652534
Change-Id: Iec592343425a23c7ada5f73cf30b8646d31eae81
2014-09-25 17:03:53 +01:00
Christoph Studer
8465c00440 am 78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev
* commit '78205c2b2e4f28cdafff93be2c599097b1b9f00d':
  NoMan: Add 3s timeout in matchesCallFilter()
2014-09-25 11:03:02 +00:00
Christoph Studer
e1b032a840 Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev 2014-09-25 10:53:47 +00:00
Svetoslav
8aeb091294 Accessibility events may be fired even if no services observe them.
If all accessibility services are disabled we turn off event firing
to avoid a lot of work for nothing. The logic to do that had a flaw
and was not turning event firing off in every case it should. We were
tuning event firing if it is on and no service is enabled but it
is possible that a package on the system image is disabled so the
service is enabled just not bound. Arguably we can remove the
serivice from the enabled list but it is technically on the device.
Note that we correctly handle the case of a package being removed.

bug:17332506

Change-Id: I6d6d9cb9cc271116a3d22ed9fd8d7f533dec9a0b
2014-09-24 17:55:53 -07:00
Jeff Sharkey
c4997a1d9c am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '45ef18b63e78fd853865f42d9369a5c9b4dd4ba0':
  Include reason when wiping data.
2014-09-24 23:35:37 +00:00
Jeff Sharkey
0a285b4462 Merge "Include reason when wiping data." into lmp-dev 2014-09-24 23:27:25 +00:00
Andreas Gampe
a103ebed6e resolved conflicts for merge of dfdabe37 to lmp-dev-plus-aosp
Change-Id: Ia9c350dcfb41f9d04400a86bd7e5f2cf2af656f1
2014-09-24 15:38:02 -07:00
Andreas Gampe
dfdabe3728 am 6f954cf2: Merge "Frameworks/base: Early init native bridge"
* commit '6f954cf2eb2baadf26bc0aba6272ef19b5dd45a0':
  Frameworks/base: Early init native bridge
2014-09-24 22:10:15 +00:00
Andreas Gampe
6f954cf2eb Merge "Frameworks/base: Early init native bridge" 2014-09-24 21:59:51 +00:00
RoboErik
e053f625f7 am 2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
* commit '2a638f08dc4c750bfd0e358768ddde98c7f23b09':
  Clear the volume cache for all inactive state transitions
2014-09-24 21:48:26 +00:00
RoboErik
143dc769ef Merge "Clear the volume cache for all inactive state transitions" into lmp-dev 2014-09-24 21:35:56 +00:00
Dianne Hackborn
aa2f3d68a1 am 2a857c63: Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev
* commit '2a857c633ddf2cdb02c768f9340ecb5abe468c48':
  Work on issue #17624121: Settings crash while launching on wiped device
2014-09-24 21:14:06 +00:00
Dianne Hackborn
fae2aabc30 Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev 2014-09-24 21:06:47 +00:00
Jeff Sharkey
004a4b20f8 Include reason when wiping data.
This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: If8413e5d6377773f37e8b34ae3d26347226a027c
2014-09-24 13:58:09 -07:00
Dianne Hackborn
04dec5c66d am 5576641a: Merge "Fix issue #17614141: Add protection for accessing images" into lmp-dev
* commit '5576641a9709a03df5f4e45ac91ff94fa5b1bb18':
  Fix issue #17614141: Add protection for accessing images
2014-09-24 20:50:40 +00:00
Dianne Hackborn
b294eac086 Merge "Fix issue #17614141: Add protection for accessing images" into lmp-dev 2014-09-24 20:44:18 +00:00
Dianne Hackborn
337abb3b4e Fix issue #17614141: Add protection for accessing images
Add basic filename protection, also only file names that are for
app icons so this can't be abused to access thumbnails.

Change-Id: I2831c0f3f08a39aa734f93f76b6fd4aaf97e87c6
2014-09-24 12:44:29 -07:00
Chet Haase
faf1d7d865 am 66287788: Merge "Avoid drawing the starting window twice" into lmp-dev
* commit '66287788d35687a140df10ac96646cdf04f91a88':
  Avoid drawing the starting window twice
2014-09-24 18:41:14 +00:00
Chet Haase
ee9d415f9b Merge "Avoid drawing the starting window twice" into lmp-dev 2014-09-24 18:31:07 +00:00
Dianne Hackborn
ff072725e3 Work on issue #17624121: Settings crash while launching on wiped device
Cleaner paths and better error reporting when a problem goes wrong
while binding an application.  This gets rid of the (recently added)
error about removing a process that hasn't been killed, and cleanly
kills the process along with more detailed errors about where things
failed.

Change-Id: I710a209c14da1515929e6254396b793177eee115
2014-09-24 10:56:28 -07:00
Robin Lee
d0a1dbc590 am 0a803fcc: Merge "Reset keystore when user is added or removed" into lmp-dev
* commit '0a803fcc2a000985a42072db5b4c9d4917139fcf':
  Reset keystore when user is added or removed
2014-09-24 17:50:21 +00:00
RoboErik
23b113592a Clear the volume cache for all inactive state transitions
bug:16988480
Change-Id: I0426c76681f8ec832c3f72842ee494d286050fea
2014-09-24 09:36:17 -07:00
Chet Haase
8eb48d26cc Avoid drawing the starting window twice
Logic in WindowState caused a delayed layout on the starting window,
which forced another layout/draw pass, which was unnecessary. Making
the resize call happen sooner means that that request gets lumped in
with a pending layout request, so there's only one resulting draw.

This saves not only the second drawing operation, but also the creation
of an extra buffer in SurfaceFlinger for that second draw request. This
buffer is temporary, but can be quite large on some devices and push
the system over the memory edge in extreme situations. It's difficult
to track this memory usage difference as the buffer resides at a very
low level in the system. But you can see in systrace that the second
allocation (and the second draw) is not happening after the fix.

Issue #17570761 Constrain starting window to only one buffer

Change-Id: I0e0fff7efdc812730706afccbfb020dea3f8d3e2
2014-09-24 07:31:29 -07:00
Christoph Studer
12aeda802e NoMan: Add 3s timeout in matchesCallFilter()
In Priority mode, NoMan can block the telecom Ringer
indefinitely when looking up the caller contact details via
ContactsProvider.

Fix this by introducing a 3s timeout and assume the call
matches the call filter when the timeout is hit.

Bug: 17598245
Change-Id: Ia0893cf203e6ffd943c749719ebb9e0f0958eb01
2014-09-24 14:55:32 +02:00
Robin Lee
49d810cb63 Reset keystore when user is added or removed
Because user IDs are recycled it is not safe to leave this kind of
information around after deleting.

Bug: 17403144
Change-Id: I441f85750cf8818adaf62a1acdb2ba7b4bfc1b7e
2014-09-24 11:51:52 +01:00
Zoltan Szatmary-Ban
fc03ebcbc8 am da833aa6: am 7602bc54: Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev
* commit 'da833aa602d59669c3840003b005e8de8168bebe':
  Register ActivityManagerService.PackageMonitor for all users.
2014-09-24 10:03:30 +00:00
Zoltan Szatmary-Ban
bdc07b6986 Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev 2014-09-24 09:41:19 +00:00
Craig Mautner
dec2aa6c42 am 70d43b40: am d5b329e5: Merge "Force layout and animation when display changes" into lmp-dev
* commit '70d43b4044fe4ff4828d2a6ecef32d77215234ac':
  Force layout and animation when display changes
2014-09-24 02:35:54 +00:00
Lorenzo Colitti
ea09344b8d am 2726c192: am 895b6726: Merge "Only stop/start clatd if necessary." into lmp-dev
* commit '2726c1928c955c968810b2207edd4f3f31cf65f8':
  Only stop/start clatd if necessary.
2014-09-24 02:26:30 +00:00
Lorenzo Colitti
a2209a667c am b5a2f9ea: am 6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
* commit 'b5a2f9eac026a7798b28e0c8f412aee7b7a01c36':
  Block address families with routes, not NetworkAgent side channel
2014-09-24 02:26:26 +00:00
Dianne Hackborn
fbd98105fb am bee5b25b: am 0d18d08d: Merge "Work on issue #17628623: Need to update default preferred activities for YouTube" into lmp-dev
* commit 'bee5b25b6d95eb8dd586dd2024400593c6039750':
  Work on issue #17628623: Need to update default preferred activities for YouTube
2014-09-24 02:26:02 +00:00
Matthew Williams
547f01c8b8 am c212440a: am 07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev
* commit 'c212440a45139c27045a0822b56aab91e8d11049':
  Fix lock ordering in JobScheduler
2014-09-24 02:25:55 +00:00
Craig Mautner
83a76db6c5 Merge "Force layout and animation when display changes" into lmp-dev 2014-09-24 01:43:02 +00:00
Craig Mautner
9b5e824da7 Force layout and animation when display changes
Each time that window manager gets a notification that a display has
been added, removed or changed, run a pass through
performLayoutAndPlaceSurfaces. This ensures that
WindowAnimator.animate() runs once so that the surfaces of remote
displays can be updated with their visibility.

Fixes bug 17533991.

Change-Id: If8745527df86c74da75fbe26b8a2a6fddeb74d2a
2014-09-23 18:37:49 -07:00
Lorenzo Colitti
75b8966cad Merge "Only stop/start clatd if necessary." into lmp-dev 2014-09-24 01:21:17 +00:00
Lorenzo Colitti
e034716628 Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev 2014-09-24 01:21:06 +00:00
Dianne Hackborn
58817f502c Merge "Work on issue #17628623: Need to update default preferred activities for YouTube" into lmp-dev 2014-09-24 01:00:03 +00:00
Matthew Williams
8cfd9e6c11 Merge "Fix lock ordering in JobScheduler" into lmp-dev 2014-09-24 00:58:55 +00:00
Matthew Williams
48a30db75d Fix lock ordering in JobScheduler
BUG: 17625667
Two part clean-up.
1) Don't try to lock in onControllerStateChanged. Do it in the handleMessage
instead where the rest of the locking is. This is sufficient to fix this bug.
2) The other side of the deadlock came b/c we lock when cancelling and calling
stopTrackingJob. Controllers handle their own locking so this isn't
necessary. B/c of a potential race from the controller side, added an explicit
check for the JSS to only run an expired job if it still exists.

Change-Id: Iaeebbc19437eb5b73e3ced3168f1fc13e564a4be
2014-09-23 17:34:46 -07:00
Dianne Hackborn
eeb2c7e712 Work on issue #17628623: Need to update default preferred activities for YouTube
Improve the warning logs when setting up preferred activities
to help identify when there are issues and what they are.  Also
improve the algorithm a little to still apply permissions when
resetting them and there are additional third party apps, as long
as the additional app is something like another browser and the
preferred activity being set is more specific (has a better match).

And add an example of using manifest-based preferred activities
in to ActivityTest -- and yes it DOES work! :p

Change-Id: I1ff39e03a5df6526206e0c3882085396b355d814
2014-09-23 16:45:39 -07:00
Michael Wright
c93fbd1fae Specify a device identifier for keyboard layout notification.
Bug: 17614683
Change-Id: If53489b09212bfa487d7dc3a7f9b000731d949ac
2014-09-23 14:59:23 -07:00
Jeff Brown
7e872cb6a5 am a8516dc4: am 42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev
* commit 'a8516dc4baa8fc32446e5a4f2564b2539b4b6a09':
  Move setting the display state out of the critical section.
2014-09-23 21:14:31 +00:00
Dianne Hackborn
c21c6ab3a7 am 076741d5: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev
* commit '076741d5776be95a19259827d1e1b2b196eb4ba3':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
2014-09-23 21:14:20 +00:00
Jeff Brown
6800e1b921 Merge "Move setting the display state out of the critical section." into lmp-dev 2014-09-23 21:02:43 +00:00
Dianne Hackborn
d0e0154c1f Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 2014-09-23 20:55:05 +00:00
John Spurlock
17699e0660 am 8d2a9c14: am c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev
* commit '8d2a9c14243479175ac1bcffe77104212c7ea283':
  Remove redundant wifi-display notification.
2014-09-23 20:26:31 +00:00
Jeff Brown
e75926d6dc Move setting the display state out of the critical section.
Setting the display power state currently happens while holding the
display manager lock.  This change moves it out of the lock to
ensure other services don't get stuck for several hundred
milliseconds.

Unfortunately, surface flinger ends up stalled a little later
so this only solves part of the problem.

Bug: 17623774
Change-Id: I201137c5e7f82c776f28a436845fcf3191fd0ca5
2014-09-23 13:12:00 -07:00
Dianne Hackborn
99b89e15eb am 0d4d4246: am 14e957ee: Merge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev
* commit '0d4d42462b7ad63aac09e86b20aa3fdfc28369a7':
  Fix issue #17307700: retarget a relinquished task is not working
2014-09-23 20:09:29 +00:00