Commit Graph

66961 Commits

Author SHA1 Message Date
Wenchao Tong
c3b022ded1 Merge "NetworkStatsService to adjust VPN stats before recording." 2015-03-13 00:54:09 +00:00
Wenchao Tong
f5ea340aab NetworkStatsService to adjust VPN stats before recording.
* Creates a new Parcelable class VpnInfo to hold required
  parameters for VPN stats adjustments.
* ConnectivityService to collect infomation and provide
  a list of VpnInfo, one for each user.
* NetworkStatsService passes the VpnInfo array to
  NetworkStatsRecorder.
* NetworkStatsRecorder calls NetworkStats.migrateTun()
  to do the math.
* Poll NetworkStats when the vpn application calls
  setUnderlyingNetworks().

Bug: 19536273
Change-Id: I7a4c7726b8243fead10416f7ec6eb5cf95f20183
2015-03-12 17:43:41 -07:00
Hui Shu
d7c7e566aa Merge "Add API for WebView OffscreenPreRaster setting." 2015-03-13 00:38:47 +00:00
Marco Nelissen
a80ac05f85 resolved conflicts for merge of 42f55d1e to master
Change-Id: I9c26861c5b0e26bb55e50b2133b7561348a01aec
2015-03-12 16:17:45 -07:00
Hui Shu
b1ee70b149 Add API for WebView OffscreenPreRaster setting.
BUG: 19592029
Change-Id: Ic903b823e5f7830e2cf2d4f3dd9a5458334648a3
2015-03-12 16:04:07 -07:00
Wenchao Tong
8726e9a73e Merge "NetworkStats to support VPN accounting." 2015-03-12 22:10:56 +00:00
Roozbeh Pournader
4f831caa49 Merge "Fix negative touch word offset that caused crashing when selecting text" 2015-03-12 21:45:22 +00:00
Jeff Brown
c3eea84a0b Merge "Revert "Update ParcelFileDescriptor to use non-blocking I/O."" 2015-03-12 21:25:40 +00:00
Jeff Brown
0f0b7f2fb3 Revert "Update ParcelFileDescriptor to use non-blocking I/O."
Bug: 19715279
This reverts commit a34a3bdcbf.

Change-Id: Ief03dee1c0a2b4d906797a5c279663c17439c347
2015-03-12 21:25:00 +00:00
Yin-Chia Yeh
d6ee06a0c8 Merge "Camera: add @hide API for setting camera rotation" 2015-03-12 20:36:49 +00:00
Prashant Malani
737298b93e am 276d1bc9: am a98c21a6: Make circular mask thickness configurable
* commit '276d1bc929485e53ba4d4e93d4cc3ded3fcc2fc3':
  Make circular mask thickness configurable
2015-03-12 20:31:52 +00:00
Justin Koh
efac42a019 am e011eb4f: am dff0fdb4: Merge "Add translatable=false to dozeComponent" into lmp-mr1-modular-dev
* commit 'e011eb4ff9a082de69fea747141764de2f6f3dcc':
  Add translatable=false to dozeComponent
2015-03-12 20:31:41 +00:00
Mady Mellor
27d6b97f63 Fix negative touch word offset that caused crashing when selecting text
Previously the offset between the touch event and the start / end of
the word could result in a negative value - we don't care or want
this value to be negative. The negative value also causes the returned
offset to be outside the bounds of the text which resulted in a crash.

Bug: 19705184
Change-Id: I4287df7778c246dd10654f1a1f1e57538e940730
2015-03-12 19:24:26 +00:00
Filip Gruszczynski
c6ee744a90 Merge "Allow polling for WindowInsets." 2015-03-12 15:12:45 +00:00
Leon Scroggins III
af66416e4b Merge "Make Bitmap_createFromParcel check the color count." 2015-03-12 12:24:11 +00:00
Clara Bayarri
f84a9724f1 Move the "Replace" popup option to the Text Selection ActionMode.
As a first step in unifying the cut/copy/paste ActionMode in Editor
with the paste/replace popup, I'm moving the replace option to
the CAB ActionMode. Paste is already there, so for now all options
are together.

Missing things to address in upcoming CLs:
- Invoke the ActionMode in all cases where the popup shows up now,
ensuring only the options that are currently available show up.
- Get rid of the current popup
- Make the ActionMode a floating toolbar (pending feature completion)
- Define a keyboard shortcut for replace?

Note that since the ActionMode still shows up in the ActionBar and
replace has no icon it now appears as text and takes up lots of
space. This will improve when we can switch to using a floating
toolbar.

Change-Id: Ib6b60bae9b58e4db96b9c4cee556e19d3f1bb466
2015-03-12 10:31:11 +00:00
Jim Miller
216ce5d7b2 Merge "Add rename support to FingerprintManager" 2015-03-12 01:20:05 +00:00
Jim Miller
99d6019bea Add rename support to FingerprintManager
Bug 19592835

Change-Id: I656b3932caf2cfdb9a330522d171a59af2c7a2d1
2015-03-11 18:17:55 -07:00
Greg Hackmann
d5e97f93f0 Fix 64-bit MessageQueue JNI build
Change-Id: I75b3788e7dcece4a2d64d969a10d28e7a9593cd6
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-11 16:54:37 -07:00
Jeff Brown
a34a3bdcbf Update ParcelFileDescriptor to use non-blocking I/O.
Avoids spinning up a thread just to watch a file descriptor.

Bug: 10349083
Change-Id: I814cb252f075d7a162e1286bbfd1dbec28d17796
2015-03-11 15:37:21 -07:00
Jeff Brown
dc3eb4bf91 Add support for non-blocking I/O with Looper.
Bug: 10349083
Change-Id: I4a94b1eac53df57c05103913bd593d92b1e062d7
2015-03-11 15:00:35 -07:00
Jeff Brown
803c2affcb Expose some useful methods on Looper and clean up docs.
Change-Id: I40796c3ba07d3c50043da56e835f11fbf9852d30
2015-03-11 15:00:35 -07:00
Jeff Brown
3d4e7efe37 Move sync barrier methods into MessageQueue.
The methods were previously defined on Looper but on reflection
they actually make more sense on the MessageQueue instead since
the Looper class is primarily concerned with thread lifecycle
rather than the actual messages themselves.

Change-Id: Iff356b94754fc9960774fa17e3eec9604229cba6
2015-03-11 15:00:34 -07:00
Jeff Brown
6c7b41adf9 Rename Looper::isIdling() to isPolling() to resolve confusion.
The loop isn't technically idle at this time, it's just checking
whether any file descriptors have pending events.  However it's
still a good signal as to whether the loop is alive.

Added a real isIdle() function.

Bug: 19532373
Change-Id: Idd273e8774f469ccafb00d560818cf279dfd6ba6
2015-03-11 15:00:34 -07:00
Alan Viverette
cd3c33e6bc Merge "Fix dialog overlay theme background color, add theme attr" 2015-03-11 21:24:46 +00:00
Alan Viverette
c0653dad13 Fix dialog overlay theme background color, add theme attr
Bug: 19524852
Change-Id: Id3188d5c0ac9ef985bb17831c46a8aff20f89bc1
2015-03-11 14:21:14 -07:00
Filip Gruszczynski
954289d9a9 Allow polling for WindowInsets.
Change-Id: I36feb2403b1bcf6de5d8808734c46999a38e7403
2015-03-11 14:11:58 -07:00
Alan Viverette
1130363f18 Merge "Various fixes for popup monkey testing" 2015-03-11 21:04:28 +00:00
Roozbeh Pournader
6c2f4484e3 Merge "Add a check for invalid spans being set by SpellChecker." 2015-03-11 20:09:38 +00:00
John Reck
5fcf44b10e Merge "Cleanups & simplifications" 2015-03-11 19:42:29 +00:00
Alan Viverette
8fd949e680 Various fixes for popup monkey testing
Ensures PopupMenu works correctly when multiple calls are made to show
and dismiss. Ensure PopupWindow works correctly when multiple calls are
made to showAsDropDown and dismiss (fixes multiple clicks on Spinner).

Bug: 19672907
Bug: 19671831
Change-Id: Ib92accd8fd70a1ff1f8cda27155347b007a4d25b
2015-03-11 12:21:30 -07:00
Raph Levien
60cd30d99e Merge "Fix android.text.cts.StaticLayoutTest#testGetEllipsisCount" 2015-03-11 18:33:59 +00:00
John Reck
b36016c65f Cleanups & simplifications
Change-Id: I5ad5e3b8fe55b1528f2e20c63e5abe51d9e40ff1
2015-03-11 11:29:13 -07:00
Marco Nelissen
42f55d1e68 am a3d25d74: Merge "Fix context leak"
* commit 'a3d25d7489d7e071fb6db01b62ec9d925e1d493d':
  Fix context leak
2015-03-11 18:21:24 +00:00
Roozbeh Pournader
4cdeeadd42 Add a check for invalid spans being set by SpellChecker.
One of the exit conditions of the loop immediately above the code is
when a BreakIterator finishes its input and emits BreakIterator.DONE,
which we were then mistakenly then using as a parameter for setting
spans.

Bug: 12936072
Bug: 5555929
Change-Id: Ib4aba113f2e7838cd040076160c1dd0fb90adb1a
2015-03-11 11:09:34 -07:00
Raph Levien
ce4155a204 Fix android.text.cts.StaticLayoutTest#testGetEllipsisCount
The "moreChars" predicate (which is used in ellipsis computation) was
slightly incorrect, sometimes being computed as false when the line
break is at the end of a paragraph but not the end of the buffer.
This patch makes the behavior consistent with shipping versions.

Bug: 19676414
Change-Id: I72e16794e895c2eb765b21feaf59fcdccc4857f1
2015-03-11 11:02:33 -07:00
Leon Scroggins III
ec419e0b73 Make Bitmap_createFromParcel check the color count.
When reading from the parcel, if the number of colors is invalid, early
exit.

Add two more checks: setInfo must return true, and Parcel::readInplace
must return non-NULL. The former ensures that the previously read values
(width, height, etc) were valid, and the latter checks that the Parcel
had enough data even if the number of colors was reasonable.

Also use an auto-deleter to handle deletion of the SkBitmap.

BUG=19666945

Change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6
2015-03-11 17:34:51 +00:00
Selim Gurun
78568bfa1f Merge "Implement PostMessage API for Webview" 2015-03-11 17:32:35 +00:00
Prashant Malani
276d1bc929 am a98c21a6: Make circular mask thickness configurable
* commit 'a98c21a662040a8afa75a35bd882c292f7ed8414':
  Make circular mask thickness configurable
2015-03-11 17:24:54 +00:00
Justin Koh
e011eb4ff9 am dff0fdb4: Merge "Add translatable=false to dozeComponent" into lmp-mr1-modular-dev
* commit 'dff0fdb4172a230e4faff7ed93842c21a2d57335':
  Add translatable=false to dozeComponent
2015-03-11 17:23:34 +00:00
Selim Gurun
4c8093afe3 Implement PostMessage API for Webview
Bug: 10237116

This CL implements the postmessage API for webview. It provides
a way for java applications to post messages to JS frames and
establish message channels, and then do full-duplex communication
after that.

Change-Id: Idbc2918552a4c9fd28ae1ddf19bd360e71f8a4a2
2015-03-11 10:21:59 -07:00
Marco Nelissen
926ebb860a Fix context leak
Using an activity context with AudioManager could cause that context
to be held on to longer than desired, for example if the caller
acquired audio focus but never abandoned it. Fix acquire/abandon in
VideoView, and use the application context in AudioManager to mitigate
the issue for other misbehaving code.

Bug: https://code.google.com/p/android/issues/detail?id=152173
Change-Id: I0fb8390207422c784800dda25b1f2c03d4574bcd
2015-03-11 10:00:28 -07:00
Geoff Mendal
4771577a34 Import translations. DO NOT MERGE
Change-Id: I217bbbfd12e4a19163c37fb7035f61628a67423d
Auto-generated-cl: translation import
2015-03-11 07:33:53 -07:00
Tor Norbye
4998467ce1 Merge "Fix @ColorInt javadoc" 2015-03-11 03:43:13 +00:00
Tor Norbye
5b00941a6f Fix @ColorInt javadoc
Change-Id: Icea3a3b4013b4a6b5f9809eec082ea93bc26b079
2015-03-10 19:14:03 -07:00
Prashant Malani
a98c21a662 Make circular mask thickness configurable
Obtain the circular mask thickness as a dimension so that it can
be customized per-device.

Change-Id: Ied88f91424c5cf4f25dd1e78cf22f0fd7ea7b0a4
Signed-off-by: Prashant Malani <pmalani@google.com>
2015-03-11 00:34:15 +00:00
Andreas Gampe
8ccfe899a7 Merge "resolved conflicts for merge of b6d6c04a to master" 2015-03-11 00:19:27 +00:00
Adrian Roos
bd5e03b6d9 Merge "Notify TrustAgentService when device policy configuration no longer applies" 2015-03-11 00:12:56 +00:00
Ricky Wai
73f43da509 Merge "Add Phone.ENTERPRISE_CONTENT_URI" 2015-03-10 22:46:23 +00:00
Andreas Gampe
2c1078fbbd resolved conflicts for merge of b6d6c04a to master
Change-Id: I5286b9fe2d9bde4b219496e593cf028cc4c75bc7
2015-03-10 15:45:36 -07:00