drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,685 Commits 1 Branch 0 Tags
Commit Graph

175685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Mark Salyzyn
e2c8e504d1 Merge "logd: optimize statistics" 2015-03-18 20:13:35 +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
Andreas Gampe
ad555f91a0 Frameworks/base: Fix potential NPE in Script 
Bug: 19797138
Change-Id: I5cd9394bd2c0f7c044c1f2f24665384fa797cd97
 2015-03-18 12:24:57 -07: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
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
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
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
Rich Slogar
1265575d8a am 96693b29: am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2 
* commit '96693b29774713d156fd035cda174cfd7b4d9b65':
  docs: downloads for sdk 24.1.2
 2015-03-18 17:41:28 +00:00
Rich Slogar
96693b2977 am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2 
* commit '8d3f587f15016d193e4739e3893b77e11336b498':
  docs: downloads for sdk 24.1.2
 2015-03-18 17:35:46 +00:00
Rich Slogar
8d3f587f15 am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2 
* commit '57c24fbb90dd7b342b06e2daecc1033f92d730da':
  docs: downloads for sdk 24.1.2
 2015-03-18 17:27:29 +00:00
Kenny Root
61ecb53e73 resolved conflicts for merge of fb9ff42d to lmp-mr1-dev-plus-aosp 
Change-Id: Ifff03303c62aeba576974b877988b3a479945aa2
 2015-03-18 10:26:11 -07:00
Rich Slogar
57c24fbb90 am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2 
* commit '2fc33a008c02cf408e1d270972bbf681c7a36785':
  docs: downloads for sdk 24.1.2
 2015-03-18 17:20:51 +00:00
Rich Slogar
2fc33a008c am ddc44153: docs: downloads for sdk 24.1.2 
* commit 'ddc44153295174e8195286c21d7edcd3962b3661':
  docs: downloads for sdk 24.1.2
 2015-03-18 17:13:55 +00:00
Geoff Mendal
b48d3ce076 am 54064f66: (-s ours) Import translations. DO NOT MERGE 
* commit '54064f66c949fa4069b4abb025c31afe28ac98ab':
  Import translations. DO NOT MERGE
 2015-03-18 16:54:56 +00:00
Dong Zhou
58ba39ed86 am 94573dc5: am 89f41eb3: Define the capability to speed up MT call audio 
* commit '94573dc5515d69458effc92b66922f757adde4d0':
  Define the capability to speed up MT call audio
 2015-03-18 16:54:37 +00:00
Kenny Root
c3f497ae7d am 4ff668d4: Track change to Conscrypt 
* commit '4ff668d47ab9f49ec81606aec6d469ecd6ca37fa':
  Track change to Conscrypt
 2015-03-18 16:54:33 +00:00
Kenny Root
fb9ff42d74 am fbd8805c: Merge "Track change to Conscrypt" into lmp-mr1-ub-dev 
* commit 'fbd8805cd783e34aebf521913aeab6cfd483b7b2':
  Track change to Conscrypt
 2015-03-18 16:54:29 +00:00
Geoff Mendal
3b419c0f5c am c0ca0de7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'c0ca0de76e2a8b72ecc4068fcf5dfbef519e7ca6':
  Import translations. DO NOT MERGE
 2015-03-18 15:43:02 +00:00
Geoff Mendal
c0ca0de76e Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-18 15:37:18 +00:00
Geoff Mendal
0a3963c7b1 Import translations. DO NOT MERGE 
Change-Id: I20b86613eb30cf53d0a421068cb3a93e63750c9f
Auto-generated-cl: translation import
 2015-03-18 08:00:13 -07:00
Geoff Mendal
54064f66c9 Import translations. DO NOT MERGE 
Change-Id: Ifd3f512fcd1aabd685f10218eceda8f4f83bb116
Auto-generated-cl: translation import
 2015-03-18 06:04:44 -07:00
Geoff Mendal
2e5651dbfd am 8d889a67: (-s ours) Import translations. DO NOT MERGE 
* commit '8d889a67d079200fac0530542f48dd1d2fdedc4e':
  Import translations. DO NOT MERGE
 2015-03-18 12:54:48 +00:00
Geoff Mendal
8d889a67d0 Import translations. DO NOT MERGE 
Change-Id: I046ce211561d45c3ee6b1763a7578d9ac54f3c90
Auto-generated-cl: translation import
 2015-03-18 05:47:44 -07:00
Andreas Gampe
4236ad7a2f Frameworks/base: Fix potential NPE in InputMethod 
Don't read the size of an unchecked list.

Bug: 19797138
Change-Id: I9d8c087aff7bc9cc1e8aae9a0b489e23b5442765
 2015-03-17 21:07:21 -07:00
Andreas Gampe
16720c1849 Frameworks/base: Remove duplicate check in Mesh 
Bug: 19797138
Change-Id: I0b11c4ff63a8031d5e58a06ac13f91ae0bbac5dc
 2015-03-17 19:10:14 -07:00
Rich Slogar
ddc4415329 docs: downloads for sdk 24.1.2 
b.android 160727

Change-Id: I112badc736ce4b85fabe0b702a2b24800ee589bd
 2015-03-17 17:20:09 -07:00
Jason Sams
1e68bac5f8 Avoid duplicate surface creation. 
Change-Id: I43104c8b48dd26681735940e6b2e1ba902af2020
 2015-03-17 16:36:55 -07:00
Andreas Gampe
4976e2de8d Frameworks/base: Fix visibility flag in Editor 
Fix double check.

Bug: 19797138
Change-Id: I95e694f384f1f25d6cf3b6a1669052940385e41d
 2015-03-17 16:08:43 -07:00
Dong Zhou
94573dc551 am 89f41eb3: Define the capability to speed up MT call audio 
* commit '89f41eb39e910e220957ac861651ead17eff9085':
  Define the capability to speed up MT call audio
 2015-03-17 22:28:22 +00:00
Kenny Root
4ff668d47a Track change to Conscrypt 
(cherry picked from commit 9d2d6b6b4b1b16221cbd857703cd6301c6bf873c)

Bug: 19798387
Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413
 2015-03-17 22:22:48 +00:00
Kenny Root
fbd8805cd7 Merge "Track change to Conscrypt" into lmp-mr1-ub-dev 2015-03-17 22:21:58 +00:00
Dong Zhou
89f41eb39e Define the capability to speed up MT call audio 
Bug: 19656525
Change-Id: I0bc88e85b807871b2883a785efac91bd0e1f6d8d
 2015-03-17 22:16:52 +00:00