4037 Commits

Author SHA1 Message Date
Alan Viverette
2d4c476aca Merge "Fix accessibility delegation" 2015-01-08 00:07:25 +00:00
Alan Viverette
a54956a0bc Fix accessibility delegation
Ensures that delegate code is run last. Previously, calling the super
method from an accessibility delegate set on a widget would only run
code in the widget's parent. Next, the delegate code would run. Finally,
the widget's code would run. As a result, the widget code would override
any data supplied by the delegate.

By moving all overridden code to internal methods, we ensure that the
call chain for super includes the widget's parent code followed by the
widget's code. The delegate code will always run last.

BUG: 17641433
Change-Id: Ib9d403156c1fc4fb04f65f3c126d1277a44b3740
2015-01-07 16:05:02 -08:00
Paul Miller
4adf212743 am c2a17fff: am a517e81e: Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev
automerge: b5f149e

* commit 'b5f149e06e7e56b7652af44af9092e806665e84e':
  Fix crash on pasting text in a WebView
2015-01-07 01:49:31 +00: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
5f86b66c9b am 24bc8d76: am 29807195: Merge "Fix issue : APR: Frequent crash in android" into lmp-mr1-dev
automerge: d17218e

* commit 'd17218e7df24da8a2bcf6e7714dc0151155c3286':
  Fix issue : APR: Frequent crash in android
2015-01-05 23:16:42 +00:00
Dianne Hackborn
d17218e7df am 24bc8d76: am 29807195: Merge "Fix issue : APR: Frequent crash in android" into lmp-mr1-dev
* commit '24bc8d761ae525f82dcaeee576ae238ab3a2de03':
  Fix issue : APR: Frequent crash in android
2015-01-05 23:15:10 +00:00
Dianne Hackborn
2980719512 Merge "Fix issue : APR: Frequent crash in android" into lmp-mr1-dev 2015-01-05 23:03:48 +00:00
Dianne Hackborn
b182955a1e Fix issue : 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
7768fd2f8e am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
automerge: 74882cb

* commit '74882cb0e3810ab1d77bc85a9ed1fa2b024a0159':
  Don't override dialog icon drawable unless valid resource ID was set
2015-01-05 21:50:18 +00: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
496894b0e1 am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java." automerge: e37f3af
automerge: e6f2f9d

* commit 'e6f2f9db42632f581d221ece90e1824e114f2f12':
  Move the remaining ZygoteInit native code over to Java.
2014-12-18 21:00:53 +00: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
Elliott Hughes
26b56e628b Move the remaining ZygoteInit native code over to Java.
Bug: 18719692
Change-Id: I5f9834edecdbcc065a33a9921c740a53441636a4
2014-12-17 12:28:29 -08:00
Elliott Hughes
dc4b6a892a am 8b3df1f9: am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java."
* commit '8b3df1f971dec922aba4df766ae25dc16c660445':
  Rewrite selectReadable JNI in Java.
2014-12-17 19:48:49 +00:00
Elliott Hughes
8b3df1f971 am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java."
* commit 'a1beb930f59ae88f4386726cdf3a7e5986bd74e1':
  Rewrite selectReadable JNI in Java.
2014-12-17 19:42:08 +00:00
Elliott Hughes
e6d63b9462 Merge "Rewrite selectReadable JNI in Java." 2014-12-17 18:21:06 +00:00
Narayan Kamath
7dfbafd8b3 am 6d41504d: Merge "Move frameworks users over to libcore hex encoding API." automerge: 681e6df1
automerge: 25c29c1

* commit '25c29c19474e5cb359473d3d36fdb1eddb90f50b':
  Move frameworks users over to libcore hex encoding API.
2014-12-17 18:17:01 +00:00
Narayan Kamath
25c29c1947 am 6d41504d: Merge "Move frameworks users over to libcore hex encoding API."
automerge: 681e6df1

* commit '681e6df1221ca7671f574d368d428f62184448b0':
  Move frameworks users over to libcore hex encoding API.
2014-12-17 18:14:00 +00:00
Narayan Kamath
6d41504d2c Merge "Move frameworks users over to libcore hex encoding API." 2014-12-17 13:34:00 +00:00
Alexandra Gherghina
de67e27e6b Merge "Fix image conversion" 2014-12-16 20:46:18 +00:00
Adam Powell
0b3d12aadf am 91ff85da: am 67af29f6: Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev
automerge: ea12691

* commit 'ea12691338cba1d3b6547b6eefb52388f1ed4a28':
  Fix touch intercept bug in ResolverDrawerLayout
2014-12-16 18:15:21 +00:00
Adam Powell
ea12691338 am 91ff85da: am 67af29f6: Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev
* commit '91ff85da1a2a106c8ddb5e204928e0d6ef094283':
  Fix touch intercept bug in ResolverDrawerLayout
2014-12-16 18:13:01 +00:00
Elliott Hughes
894724be30 Rewrite selectReadable JNI in Java.
Bug: 18719692
Change-Id: Id4fa95a31f112c720f7a3ac47a3b6c95c3028438
2014-12-16 10:00:33 -08:00
Narayan Kamath
78108a3e52 Move frameworks users over to libcore hex encoding API.
Removes dependency on apache-http.

bug: 18027885
Change-Id: I508db016747985ecdd68e02d5d4efcd0ddd694df
2014-12-16 17:25:07 +00:00
Adam Powell
f0af0ea33b Fix touch intercept bug in ResolverDrawerLayout
ResolverDrawerLayout could get into a state where it thought a drag
was in progress, but since there was no distance to drag it would
return false from onTouchEvent for ACTION_DOWN. This would cause it to
intercept all future touch events, blocking interaction with
ResolverDrawerLayout child views. This would only happen if none of
the child views wanted the initial ACTION_DOWN event and it ended up
being processed in the ResolverDrawerLayout itself, such as in
response to touching in empty space or on the title text, and if all
available options fit in view without needing to expand the drawer.

Fix this by only setting the dragging bit if we're going to claim the
rest of the touch events after ACTION_DOWN.

Bug 18563698

Change-Id: Iab2ec38528697c9ff36bbb08b1f1210a6879d5ef
2014-12-15 13:18:06 -08:00
Elliott Hughes
c4e9215fa5 am 2a6426c9: am e9e1e0d2: Merge "Reimplement reopenStdio in Java."
automerge: 3e8484c

* commit '3e8484c3f7f615c4b3f1cb925c4164d513cc0e97':
  Reimplement reopenStdio in Java.
2014-12-15 19:39:58 +00:00
Elliott Hughes
3e8484c3f7 am 2a6426c9: am e9e1e0d2: Merge "Reimplement reopenStdio in Java."
* commit '2a6426c900d319c7b928242694ad050a73ad324b':
  Reimplement reopenStdio in Java.
2014-12-15 19:38:04 +00:00
Elliott Hughes
dac83f5e6a Reimplement reopenStdio in Java.
Bug: 18719692
Change-Id: I4ed984cd6148c5cba75d46a60f32a0687a5bcac3
2014-12-15 11:00:25 -08:00
Marvin Paul
111d166017 Merge "Implemented backup and restore for account sync settings." 2014-12-15 18:22:46 +00:00
Alexandra Gherghina
80d119bf65 Fix image conversion
For some images, especially those in the bug linked, the conversion would
yield empty images otherwise.

Bug: 18311493
Change-Id: I90150a8837655df3c9c35b36eb02594807eb0a06
2014-12-15 15:51:47 +00:00
Paul Crowley
a97227add8 Clean up and fix warnings in LockPatternView: make things final
and private, remove unnecessary synchronization, suppress warnings
where appropriate.

Change-Id: Ie956f45d887e518db6eec8ab34a713565ebd3ca3
2014-12-15 10:28:44 +00:00
Elliott Hughes
a95b568f9a am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote."
* commit '20c906a8d40aed68ee35095f322739664e1e223a':
  Lose some unnecessary JNI from the zygote.
2014-12-12 23:32:06 +00:00
Elliott Hughes
3fe595108f Lose some unnecessary JNI from the zygote.
Bug: 18719692
Change-Id: Ie2d50400f10f3c54cfbf94e54656f6d704eac267
2014-12-12 14:07:34 -08:00
Kenny Guy
a63b620916 am dcd42f0f: am 4357d4ea: Merge "Don\'t show last used and profile button at same time." into lmp-mr1-dev
* commit 'dcd42f0fa16802d39245f3ba98a6226bde9a83e6':
  Don't show last used and profile button at same time.
2014-12-12 18:57:31 +00:00
Esteban Talavera
0b7b87a4c8 am 4f40fb47: Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev automerge: c28fa2c
* commit '4f40fb471265a164a0bdfd060d90375ce706b1dd':
  Take into account other profiles when deciding whether to show ResolverActivity
2014-12-12 17:17:32 +00:00
Kenny Guy
b8a2df10c9 Don't show last used and profile button at same time.
UI for ResolverActivity doesn't support last used
activity and work/personal profile button at the
same time. So if work/personal button is present
disable last used.

Bug: 18730438
Change-Id: I7ae7319bbdeb9bcaab9d6d03f97dea17d07c6d7f
2014-12-12 17:04:08 +00:00
Esteban Talavera
c28fa2cdd4 Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev 2014-12-12 16:59:31 +00:00
Esteban Talavera
6de72663fa Take into account other profiles when deciding whether to show ResolverActivity
Show ResolverActivity even if there is only one target
on the current profile that listens to that intent,
if other profiles can also handle it.
Also, fix crash while trying to access out of bounds
element on the list.

BUG: 18701336,18713763
Change-Id: I3a5e9cc5c0eedb2792b8f6d8a5d4aa8ee9e1256b
2014-12-12 14:34:29 +00:00
Marvin Paul
a6533256ac Implemented backup and restore for account sync settings.
Bug: 18506992
Parent Bug: 17967106

Change-Id: Iecf5ce3a24ac5f12192e65aa61f1560bc76d75a8
2014-12-12 04:35:06 +00:00
Craig Mautner
647130baac am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev
automerge: 8642803

* commit '864280369ca45f9a93f4cfe9c1d020e0cbe0d7ed':
  Add put/getBoolean/Array to PersistableBundle
2014-12-10 19:17:53 +00:00
Patrick Tjin
6b4a1c6c46 am e3703050: Add recovery kmsg to dropbox
automerge: 6aa6733

* commit '6aa6733cf8ae79adb703e4cdfd33de5385c970c1':
  Add recovery kmsg to dropbox
2014-12-10 18:58:12 +00:00
Craig Mautner
7a17e0b601 Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev 2014-12-10 16:56:15 +00:00
Patrick Tjin
e37030505e Add recovery kmsg to dropbox
Bug: 18642766

Change-Id: I10e4532904a3a8cac43bec7630b9a7a90c2424ba
Signed-off-by: Patrick Tjin <pattjin@google.com>
2014-12-10 05:16:33 +00:00
Craig Mautner
73bdf9761b Add put/getBoolean/Array to PersistableBundle
Due to popular demand the methods putBoolean(), getBoolean(),
putBooleanArray() and getBooleanArray() have been added to
PersistableBundle.

Fixes bug 18390436.

Change-Id: Id133ba902aca774f98529e36ce560e873b88ad5b
2014-12-09 18:10:20 -08:00
Jeff Sharkey
d5b5576dd6 am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
* commit '5b41696c56c124124d48168227a83b63bd55aea7':
  Offer to "merge" subscribers for data usage.
2014-12-08 19:44:27 +00:00
Dianne Hackborn
0cfdd810de am e52a2ea0: am 0029f0ac: Merge "Fix issue : Additional items in aggregated battery stats" into lmp-mr1-dev
* commit 'e52a2ea03bd7b8ed2f3680c5198e00fb7ad5c34c':
  Fix issue : Additional items in aggregated battery stats
2014-12-08 19:33: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