Commit Graph

3923 Commits

Author SHA1 Message Date
Alan Viverette
00a1fa3e43 am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev
automerge: f1a4d0e

* commit 'f1a4d0e864f17c59c0e292e8f1161ab4397e5ba4':
  Invalidate SubtitleView during setText()
2015-02-05 23:00:44 +00:00
Alan Viverette
3f7360df82 Invalidate SubtitleView during setText()
Ensures that even if layout does not change, the view is redrawn.

Bug: 19277437
Change-Id: I078ee3176c2bac6c754a0e2f378f97370ecef76a
2015-02-05 09:58:49 -08:00
Christopher Ferris
9d25fcae85 am 4fb79d14: Merge "Fix comment according to review."
automerge: ff6cebf

* commit 'ff6cebf0a65f9d6e20497295a1a9c290df85052b':
  Fix comment according to review.
2015-02-04 19:29:56 +00:00
Christopher Ferris
7254c123a1 Fix comment according to review.
Change-Id: I784f2051cd173425e9a9570ac4555cf835dd277d
2015-02-04 10:40:12 -08:00
Christopher Ferris
0654196fb0 am e7a69cbf: am dbd03924: Merge "Fix wrap property creation when truncating."
* commit 'e7a69cbf920565b4b428459198fd53f193080796':
  Fix wrap property creation when truncating.
2015-01-30 00:14:17 +00:00
Christopher Ferris
95b1048d39 Fix wrap property creation when truncating.
If a property name gets truncated, make sure it doesn't end in a '.'
since that makes the name illegal.

Bug: 19196358
Bug: https://code.google.com/p/android/issues/detail?id=82947

(cherry picked from commit e32df45fe1)

Change-Id: I126a40ffae76ee6a06926e770ca015fb063a334b
2015-01-29 15:54:40 -08:00
Christopher Ferris
e32df45fe1 Fix wrap property creation when truncating.
If a property name gets truncated, make sure it doesn't end in a '.'
since that makes the name illegal.

Bug: 19196358
Bug: https://code.google.com/p/android/issues/detail?id=82947
Change-Id: Icc1a26593237ca19ad0ebd776a60b3d6290bb355
2015-01-29 12:20:06 -08:00
Svetoslav
e5743753ee am 55120a0f: am 197adec3: Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev
* commit '55120a0f1acb9a46dc56bbdab877bc2c635f1356':
  Accessibility: Ignore overlapping siblings when computing a click location
2015-01-27 04:36:31 +00:00
Svetoslav
a1ac6a0925 Accessibility: Ignore overlapping siblings when computing a click location
To click a view we were computing a click location by ignoring overlapping
views that are actionable. However, detection whether a view is actionable
is not always possible as the view may handle touch events directly. This
leads to unhandled edge cases. We are taking a conservative approach and
ignore all overlapping siblings regardless if clickable. This is also has
limitations but hopefully less frequent edge cases.

bug:18889611

Change-Id: Icea0b7b3e2d4ed53e50e01cb6a99b880be560b14
2015-01-23 16:13:43 -08:00
Svetoslav
9027d7355e am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev
automerge: 6e9f276

* commit '6e9f276ff1554b59692a1820f60217307460308b':
  Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
2015-01-23 22:30:46 +00:00
Svetoslav
42a13865a4 Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev 2015-01-23 22:22:18 +00:00
Lorenzo Colitti
6840ffae67 am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
automerge: fbaf6b3

* commit 'fbaf6b353dc9b7218b340acf629b06ae8e0101bb':
  Use the proper IpPrefix and LinkAddress constructors in VPN code.
2015-01-23 06:06:57 +00:00
Lorenzo Colitti
78d51c2292 Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev 2015-01-23 05:57:38 +00:00
Lorenzo Colitti
b205311456 Use the proper IpPrefix and LinkAddress constructors in VPN code.
This simplifies the code, and also makes it possible for
users to point multicast routes at the VPN. The LinkAddress
objects we were previously using to construct the RouteInfo do
not accept these, but IpPrefix objects do.

Bug: 18485968
Change-Id: Ie914a2eb359b78161810ee473df725059f944f4e
2015-01-23 14:30:22 +09:00
Svetoslav
41fceb462b Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
In accessibility mode we calculate a point where to click in the accessibility
focused view as a bridge-gap solution before switching to accessibility click
actions. We cannot detect whether a view is covered by another one that consumes
all touch events, and therefore we may click on the wrong target. This was the
case with the toolbar. As a result a partially scrolled view in a scrollable
container covered by a toolbar cannot be activated and this is not an edge case.

bug:18986806

Change-Id: Ib41470c39806cec13e9b00b319879cd7f3412ab5
2015-01-22 18:51:47 -08:00
Nicolas Prevot
2cb240e083 am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge: ad44f74
* commit '3677117d2bc8b703ccad4eff5914a61508922dd6':
  Never set "Work" or "Personal apps" as prefered activities.
2015-01-22 10:32:30 +00:00
Nicolas Prevot
ad44f7448f Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev 2015-01-22 10:22:08 +00:00
Svetoslav
2b2b1a9b89 AlertActivity now behaves as a dialog for accessibility purposes. automerge: 76ff4dd
automerge: 03944ce

* commit '03944ce664c733d1922247229fc56f6630c0a5e4':
  AlertActivity now behaves as a dialog for accessibility purposes.
2015-01-21 18:39:34 +00:00
Svetoslav
76ff4dd0de AlertActivity now behaves as a dialog for accessibility purposes.
AlertActivity is intended to look like a dialog but for accessibility
purposes it was populated as an activity. As a result the content of
the "dialog" was not properly announced to the user.

bug:18865632

Change-Id: I27166fc74678981f4f3ad71d6d25727b5110340c
2015-01-21 18:28:03 +00:00
Nicolas Prevot
daf92066db Never set "Work" or "Personal apps" as prefered activities.
In ResolverActivity: when the user chooses work or personal:
Do not set them as prefered activities.

BUG:19091836

Change-Id: Ibe0081eb16e58cc25decb3f25b7fd50b5403d5fc
2015-01-21 17:53:11 +00:00
Kenny Guy
3458e180cf Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge: 06ab0ca
automerge: 11c4cc1

* commit '11c4cc196de9dca3bfad711b1b9e4b779a72cc01':
  Only hide cross profile disclosure when showing resolver.
2015-01-21 16:24:01 +00:00
Narayan Kamath
ebc57c7471 Merge "Choose the right executable for wrapped applications." automerge: aa87e89
automerge: 4af0265

* commit '4af0265a35bcd8a0a7513dd85fe371597e2038c5':
  Choose the right executable for wrapped applications.
2015-01-21 14:09:33 +00:00
Kenny Guy
2b43c73e66 Only hide cross profile disclosure when showing resolver.
Hiding the cross profile discoloure for all system apps
also meant it wasn't shown for CALL_PRIVILEGED intents.

Bug: 18702461
Change-Id: I8129bc4b07573b547aefe2dbcc6938a60305c216
2015-01-20 19:27:38 +00:00
Narayan Kamath
37ad4b0242 Choose the right executable for wrapped applications.
64 bit zygotes should exec app_process64, whereas 32 bit
zygotes should exec app_process32.

Change-Id: I63b56400e0478cd2bb206c98da6858be558f0525
2015-01-19 16:09:17 +00:00
Narayan Kamath
66bbfb6b2c am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default."
* commit '17f50f8119f4a8bdec304cde527f68ddd0b3bc0a':
  Remove support for --classpath and make --runtime-init the default.
2015-01-19 15:21:30 +00:00
Narayan Kamath
1f7d657b43 am 3e809794: am e315feea: Merge "Fix handling of wrapped processes [part 1]."
* commit '3e809794fe558d8a10851c0ac22a65a2c81fa315':
  Fix handling of wrapped processes [part 1].
2015-01-19 15:16:58 +00:00
Narayan Kamath
f48029f00a Remove support for --classpath and make --runtime-init the default.
--classpath hasn't been properly supported or used for as long as
git history exists, and the non --runtime-init classpath is useless
without it.

Also, forking and exec' a bare dalvikvm instance from the zygote seems
somewhat pointless since we might as well just execute it directly.

Change-Id: Ib07d822d448e7b431d7564381f9cd11735fd1113
2015-01-19 15:04:58 +00:00
Narayan Kamath
6ac7e67168 Fix handling of wrapped processes [part 1].
Change 3fe595108f changed our pipe creation to CLOEXEC,
which doesn't work so well for wrapper processes that call exec.

Sending down the PID pre-exec won't work so well because wrappers
are arbitrary and might fork themselves before finally starting
the child application process.

Change-Id: I065f0f2150dc1ff04d2b2e8b25f06b4c754809b9
2015-01-19 14:17:49 +00:00
Narayan Kamath
e05f269bfe am 96b87a1d: am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]"
* commit '96b87a1dc0b822a057ad978de1d52990d617be62':
  Fix handling of wrapped processes [part 2]
2015-01-19 10:15:32 +00:00
Narayan Kamath
23e68780be Fix handling of wrapped processes [part 2]
Drop privileges only if we're root. Zygote.preloadClasses can
be called from a non-root uid / gid in the case of wrapped classes,
so we shouldn't die from the resulting EPERM.

Change-Id: Ie3fbe50a17ec49bcbcb875c3a2ee1e1a3a62e88d
2015-01-16 17:40:35 +00:00
Wink Saville
691d9f9eaf am 657f9a68: am 1a6dd298: Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev
* commit '657f9a680fd1a82d83b7f8b7658388ea3456ee86':
  StateMachine.dump produces no output sometimes.
2015-01-14 12:06:22 +00:00
Wink Saville
1a6dd2985e Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev 2015-01-14 00:52:08 +00:00
Wink Saville
54b1b1a07a StateMachine.dump produces no output sometimes.
If the content to dump is large no output is produced by dump. Change
back to using a loop and flush.

Bug: 18965342
Change-Id: Ibc33da8bfffd5f998a78df0e2d70ed8e8a0aa137
2015-01-13 22:35:25 +00:00
Adam Powell
1accc9c12b am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev
automerge: 57744dd

* commit '57744dd139f3d30ed1031319dd64b289a68ac3ba':
  Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
2015-01-13 19:03:36 +00:00
Adam Powell
69c22e82e9 Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev 2015-01-13 18:57:33 +00:00
Dianne Hackborn
2abf1f1c21 Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev automerge: 54f9b1e
automerge: a319aa8

* commit 'a319aa800df36d40e1de453b64fd1e14573e6d80':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
2015-01-09 19:13:58 +00:00
Dianne Hackborn
54f9b1eedc Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev 2015-01-09 19:08:50 +00:00
Dianne Hackborn
b3d4cb369e Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
FastPrintWriter needs to have its own lock for each instance, or
else one getting blocked can cause others to block and whacky deadlocks
result.

Also:

- Improve error reporting of SystemConfig to tell you which config
  file is the problem.
- Fix CoreSettingsProvider to not spew errors if a setting is not
  defined (it should just use a default value).
- Get rid of noisy init output of ConditionProviders.
- Reduce log noise of starting a process; move some of that information
  to ProcessRecord to print on demand.

Change-Id: I1032d141ddd449968b74ab7b88ab36f2d228ad1a
2015-01-09 09:54:06 -08:00
Dianne Hackborn
3968820fc7 am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev
automerge: 16e4324

* commit '16e4324dd967d180f77fb25dbeea77229eaf0511':
  Fix issue #18827122: system server crashed on broadcasting...
2015-01-08 21:48:34 +00:00
Dianne Hackborn
29cd7f1962 Fix issue #18827122: system server crashed on broadcasting...
...an intent with invalid or null package uri

Also tweak battery stats to record in the history when we shut
down, to understand when restarts are due to clean shutdowns or
crashes.

Change-Id: I6443dafc23e356be9f569906f6081152d4f92d2b
2015-01-08 10:58:45 -08:00
Adam Powell
b6ab098bad Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
Add API for handling nested pre-processing of accessibility events
similar to nested pre-scroll or pre-fling. This allows custom views to
delegate a nested scroll to a parent via the accessibility system.

Use this functionality to allow opening the ResolverDrawerLayout via
accessibility commands.

Bug 18827274

Change-Id: Icd5a502605b78a861bb03e7b11923841a72eb9ab
2015-01-07 17:00:12 -08:00
Paul Miller
b5f149e06e am c2a17fff: am a517e81e: Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev
* commit 'c2a17fff8579959349e01783aa347b2e2492e0f2':
  Fix crash on pasting text in a WebView
2015-01-07 01:43:27 +00:00
Paul Miller
a517e81e2b Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev 2015-01-07 01:08:35 +00:00
Paul Miller
f6bf1d7b30 Fix crash on pasting text in a WebView
WindowDecorActionBar and Chrome's ContentViewCore each have their own ActionMode
reference. ActionModeImpl.finish() nulls WindowDecorActionBar's reference and
calls mCallback.onDestroyActionMode() to null ContentViewCore's reference. But
if the callback is deferred, there is a period when the ActionMode is finished
(and mCallback is null), but ContentViewCore doesn't know. ContentViewCore may
try to invalidate() the ActionMode, which will crash on the null mCallback.

Make ActionModeImpl more permissive so that calling invalidate() during this
period does nothing.

BUG:18758329
Change-Id: I407fa0e0cd3cffa217e165caed83130d44760316
2015-01-06 11:32:02 -08:00
Dianne Hackborn
d17218e7df am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev
* commit '24bc8d761ae525f82dcaeee576ae238ab3a2de03':
  Fix issue #18901214: APR: Frequent crash in android
2015-01-05 23:15:10 +00:00
Dianne Hackborn
2980719512 Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 2015-01-05 23:03:48 +00:00
Dianne Hackborn
b182955a1e Fix issue #18901214: APR: Frequent crash in android
The ShutdownActivity was implemented in the system server
code, which is no longer part of the boot class path.  This would
work fine when requesting a shutdown from the primary user, since
in that case the activity would be loaded in to the main system
process which also has the system service code loaded.

However, when executed from a secondary user, we need to spin up
a new system process for it; that system process is just a regular
app process, without the system service code, so *boom*.

To fix this, move ShutdownActivity to the framework jar.

Change-Id: Icb831cd6ed619da5feede5605c45ef177a892fbc
2015-01-05 14:40:24 -08:00
Alan Viverette
74882cb0e3 am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
* commit 'bf80d2737fc59e8ae04875edddf1534c6a7739bc':
  Don't override dialog icon drawable unless valid resource ID was set
2015-01-05 21:48:58 +00:00
Alan Viverette
5c2d8f7d51 Don't override dialog icon drawable unless valid resource ID was set
Fixes a regression where Builder.setIcon(Drawable) would get overridden
even when Builder.setIcon(int) had never been called and was still 0.
Fixes attribute id to respect all valid resource IDs (e.g. non-zero).
Updates documentation to reflect the long-standing override behavior.

BUG: 18904762
Change-Id: I905703993a59910555d5a858e0aaecab63221a02
2015-01-05 12:56:45 -08:00
Elliott Hughes
e6f2f9db42 am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java."
automerge: e37f3af

* commit 'e37f3af76dc0c876ea7169b9153f79175d0c703d':
  Move the remaining ZygoteInit native code over to Java.
2014-12-18 20:54:28 +00:00