185627 Commits

Author SHA1 Message Date
Andreas Gampe
b078ff16a3 am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod"
* commit '13dbc3d48d1c4ea8854f952f9ced4b7617ae5e87':
  Frameworks/base: Fix potential NPE in InputMethod
2015-03-18 22:33:28 +00:00
Rich Slogar
ac66a32611 am 42e0a631: am 1265575d: am 96693b29: am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2
* commit '42e0a6316f21e1a461351500ebc6cd1801f8b52c':
  docs: downloads for sdk 24.1.2
2015-03-18 22:33:20 +00:00
Andreas Gampe
4f0a96d2d9 am 9cc36ac2: Merge "Frameworks/base: Remove duplicate check in Mesh"
* commit '9cc36ac2a2e07f81a9b11da7ff08e0da58b0143e':
  Frameworks/base: Remove duplicate check in Mesh
2015-03-18 22:33:16 +00:00
Geoff Mendal
0315435551 am 28c320c2: (-s ours) am b48d3ce0: (-s ours) am 54064f66: (-s ours) Import translations. DO NOT MERGE
* commit '28c320c296ee3869f1677b95d571d9731dd0b96d':
  Import translations. DO NOT MERGE
2015-03-18 22:33:13 +00:00
Andreas Gampe
1eca7d66ee am 2a247b36: Merge "Frameworks/base: Fix visibility flag in Editor"
* commit '2a247b361089c0744202b604e22f9a79d239b92c':
  Frameworks/base: Fix visibility flag in Editor
2015-03-18 22:33:09 +00:00
Andreas Gampe
1dae2f9341 am 8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script"
* commit '8df1bedcba5bf146c49ba6b6a89e4f97c018045c':
  Frameworks/base: Fix potential NPE in Script
2015-03-18 22:33:01 +00:00
Tyler Gunn
d8cf85c249 Merge "resolved conflicts for merge of 00de38a1 to master" 2015-03-18 22:30:11 +00:00
Andrew Solovay
78bbfe049c Merge "docs: Removed sentence fragments." into lmp-docs 2015-03-18 22:27:08 +00:00
Andrew Solovay
ae279bd5b0 Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 2015-03-18 22:26:05 +00:00
Andrew Solovay
0aef0abf3d Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 2015-03-18 22:23:13 +00:00
Andreas Gampe
13dbc3d48d Merge "Frameworks/base: Fix potential NPE in InputMethod" 2015-03-18 22:19:58 +00:00
Andreas Gampe
9cc36ac2a2 Merge "Frameworks/base: Remove duplicate check in Mesh" 2015-03-18 22:19:27 +00:00
Andreas Gampe
2a247b3610 Merge "Frameworks/base: Fix visibility flag in Editor" 2015-03-18 22:19:08 +00:00
Mathieu Chartier
7a49028aa2 Add JIT late override property
Required for JIT debug property since user builds can't restart
the shell.

Bug: 19735273

Change-Id: I1983852e80010c344b45e0bb459de47c56adfce8
2015-03-18 15:18:52 -07:00
Andreas Gampe
8df1bedcba Merge "Frameworks/base: Fix potential NPE in Script" 2015-03-18 22:18:26 +00:00
James Cook
f2560e62cf Merge "Improve undo support for text entered with IME" 2015-03-18 21:39:03 +00:00
Chris Craik
43c410eaac Merge "Remove HardwareCanvas" 2015-03-18 21:36:56 +00:00
James Cook
d202668670 Improve undo support for text entered with IME
Use span properties to detect:
* Composing text - don't record undo operations
* Completing a composition - record an insert undo operation
* Canceling a composition - don't record

Save the composition state on parcel/unparcel.

Stop using begin/end batch edit to try to detect when a TextWatcher
is modifying the text. IMEs trigger multiple InputFilter passes in
a single batch edit. Use SpannableStringBuilder to determine when
we're in a TextWatcher callback because it is the authority on that
state.

Fix a bug in undo manager where it doesn't forget undos correctly if
there are more than one in the stack.

Bug: 19332904
Change-Id: Iaa9b0b2a7bf6683302cc85e7616e5d5fcc9fa202
2015-03-18 14:36:41 -07:00
Alan Viverette
dd0d4b7579 Merge "Enable/disable hardware rendering on windows by application tag" 2015-03-18 21:32:19 +00:00
Alan Viverette
9b0ab65ed4 Enable/disable hardware rendering on windows by application tag
Previously, hardware rendering cannot be enabled or disabled
on windows created without a parent activity (e.g. by services)
by setting the <application> tag, "android:hardwareAccelerated"
in AndroidManifest.xml. It's enabled by default in Android L
from the commit, 5e1565ead6dbb7d5c414522591f61b16a23de1c3.
This patch provides a way of setting hardware rendering for
that case.

Change-Id: I60ee9566e99db39cd661fe6f196f43c3968b311a
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
2015-03-18 14:21:04 -07:00
Bart Sears
91281bbdde resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev
Change-Id: Ifb6c4ec5560c50a4bb91426734d7e05cd0c46e93
2015-03-18 14:12:10 -07:00
Ed Heyl
07459a3617 Merge "Fix build: Revert "Enable/disable hardware rendering on windows by application tag"" 2015-03-18 20:40:47 +00:00
Ed Heyl
1445469b9e Fix build: Revert "Enable/disable hardware rendering on windows by application tag"
This reverts commit ae114d2eb4f2720e0435623e49ff091e2308c18c.

Change-Id: I5400c9aa121491164e8739892408c377b99f3980
2015-03-18 20:39:37 +00:00
Bart Sears
cc86bc0c92 am c2eb5c60: Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev
* commit 'c2eb5c602d36d91483c8f24b0c6859e4283724b4':
  Prevent activities from being started during setup wizard.
2015-03-18 20:28:59 +00:00
Mark Salyzyn
6a9cd7b0d4 am e2c8e504: Merge "logd: optimize statistics"
* commit 'e2c8e504d143c42c25d7e61a18f50cccb80f0c4d':
  logd: optimize statistics
2015-03-18 20:25:54 +00:00
Bart Sears
c2eb5c602d Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev 2015-03-18 20:22:36 +00:00
Clara Bayarri
532c8e9b35 Merge "Editor: Fire the selection Action Mode when long pressing on an empty space" 2015-03-18 20:21:08 +00:00
Mark Salyzyn
e2c8e504d1 Merge "logd: optimize statistics" 2015-03-18 20:13:35 +00:00
Alan Viverette
78d9de97a6 Merge "Enable/disable hardware rendering on windows by application tag" 2015-03-18 20:01:50 +00:00
Jason Sams
b533f3e1ad am 1aadd347: Merge "Avoid duplicate surface creation."
* commit '1aadd3474177e6946ea0aae03f0628e436d0cf87':
  Avoid duplicate surface creation.
2015-03-18 19:57:44 +00:00
Jason Sams
1aadd34741 Merge "Avoid duplicate surface creation." 2015-03-18 19:44:37 +00:00
Alan Viverette
ae114d2eb4 Enable/disable hardware rendering on windows by application tag
Previously, hardware rendering cannot be enabled or disabled
on windows created without a parent activity (e.g. by services)
by setting the <application> tag, "android:hardwareAccelerated"
in AndroidManifest.xml. It's enabled by default in Android L
from the commit, 5e1565ead6dbb7d5c414522591f61b16a23de1c3.
This patch provides a way of setting hardware rendering for
that case.

Change-Id: I08ce58a8644970a2a18407e83ad317a72a2dad10
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
2015-03-18 12:43:08 -07:00
Tyler Gunn
96d6c40c71 resolved conflicts for merge of 00de38a1 to master
Change-Id: Ib1ac99ba7181ad79af94a04124380833bcb79a0c
2015-03-18 12:39:23 -07:00
Alan Viverette
8c9d897534 Merge "Remove unnecessary null check in FastScroller" 2015-03-18 19:36:53 +00:00
Jose Lima
77c39392ff New ContentInfoExtender for Notifications
Added a new Extender to add Content Info data to notification objects.

Change-Id: I29a84915ad0c0bb724c2fcdc53d9a4c4db95ba93
2015-03-18 19:26:34 +00:00
Andreas Gampe
ad555f91a0 Frameworks/base: Fix potential NPE in Script
Bug: 19797138
Change-Id: I5cd9394bd2c0f7c044c1f2f24665384fa797cd97
2015-03-18 12:24:57 -07:00
John Spurlock
a212e6b5b1 Merge "Update package manager documentation." 2015-03-18 19:23:17 +00:00
Andrew Solovay
43100d3203 docs: Removed sentence fragments.
These fragments were left over from the edit process for the original
CL (http://ag/586972). The paragraph they belong to was removed.

See first comment for doc stage location.

bug: 19793140
Change-Id: Iafa30c4036c57ba00b534d619cd1fa4135f60175
2015-03-18 11:56:20 -07:00
Ricky Wai
ac1496a1c9 Merge "Add Email.ENTERPRISE_CONTENT_LOOKUP_URI" 2015-03-18 18:43:54 +00:00
Dan Sandler
b509a809b2 am fbd99e9f: am 76620791: am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
* commit 'fbd99e9fecea1cf467c082d2096cb1c3868685d4':
  Avoid crashing on corrupted notifications.
2015-03-18 18:42:47 +00:00
Dan Sandler
fbd99e9fec am 76620791: am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
* commit '76620791600af3b3d6f6ad8ba3534320265153db':
  Avoid crashing on corrupted notifications.
2015-03-18 18:35:20 +00:00
Dan Sandler
7662079160 am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
* commit 'b3a1b6632e403926fed995e851a8e44fc944c663':
  Avoid crashing on corrupted notifications.
2015-03-18 18:29:48 +00:00
Kenny Root
2974cb9fb2 am a52b0988: resolved conflicts for merge of c3f497ae to lmp-mr1-dev-plus-aosp
* commit 'a52b0988f27a0bfe88d38aee5133c25264913f68':
  Track change to Conscrypt
2015-03-18 18:28:59 +00:00
Rich Slogar
42e0a6316f am 1265575d: am 96693b29: am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2
* commit '1265575d8a31f415606cccc39b24466ecae5731d':
  docs: downloads for sdk 24.1.2
2015-03-18 18:25:10 +00:00
Geoff Mendal
28c320c296 am b48d3ce0: (-s ours) am 54064f66: (-s ours) Import translations. DO NOT MERGE
* commit 'b48d3ce076233a2da0b2146882c2e22a332fc665':
  Import translations. DO NOT MERGE
2015-03-18 18:23:51 +00:00
Dong Zhou
00de38a188 am 58ba39ed: am 94573dc5: am 89f41eb3: Define the capability to speed up MT call audio
* commit '58ba39ed86798c3d0877e0ed6bdf09c74007c36f':
  Define the capability to speed up MT call audio
2015-03-18 18:23:45 +00:00
Dan Sandler
b3a1b6632e Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev 2015-03-18 18:23:20 +00:00
Kenny Root
a52b0988f2 resolved conflicts for merge of c3f497ae to lmp-mr1-dev-plus-aosp 2015-03-18 11:20:30 -07:00
Clara Bayarri
29d2b5aa48 Editor: Fire the selection Action Mode when long pressing on an empty space
This used to fire the "paste" popup instead. It is a tiny step towards
unifying the cut/copy/paste action mode and paste popup.

Change-Id: I03dfcc294d4453e92464fc4f714468f58c692f24
2015-03-18 18:01:42 +00:00
Alex Klyubin
01a959d60a Add app-level usesCleartextTraffic manifest attribute.
The attribute declares whether the app intends to use cleartext
network traffic (e.g., HTTP, WebSockets, XMPP, SMTP, IMAP -- without
TLS or STARTTLS). The default value is true. If set to false, the app
declares that it does not intend to use cleartext network traffic. In
this case the app requests the platform, tooling, and third-party
libraries to prevent it from using cleartext traffic. The danger of
cleartext network traffic is that its confidentiality, authenticity,
and integrity are not guaranteed.

This feature is designed to help apps which care about security of
data exchanged over the network. These apps can accidentally
regress/downgrade to using cleartext network communications. This
typically happens when the server the app communicates with all of a
sudden tells it to use cleartext communications (e.g, HTTP URL
instead of an HTTPS URL) or when one of the components of the app gets
updated and regresses to cleartext communications without the
developer noticing.

In general, the prevention measures are on best effort basis. It's
impossible to automatically prevent all instances of cleartext
traffic. For example, an app bent on bypassing restrictions could
perform low-level network I/O with unusual TCP packet fragmentation,
or could use a custom application-level protocol.

The expectation is that most apps use libraries for network
communications and these libraries over time will start to honor this
flag, thus increasing the protections offered by it.

Bug: 19215516
Change-Id: I8700d51ddbc5d528faa4b6a5fa5bc9551ad02d13
2015-03-18 10:46:56 -07:00