64079 Commits

Author SHA1 Message Date
Anthony Hugh
b8f28ba07a am 457b8838: Update progress_dialog on watch to use small spinner
* commit '457b8838cb7b9383bbad832ed35e8a58c7b6051b':
  Update progress_dialog on watch to use small spinner
2015-03-24 19:09:13 +00:00
Anthony Hugh
457b8838cb Update progress_dialog on watch to use small spinner
The new material design theme causes the spinner to give us even
less room on the progress dialog screen.  This is causing cut off
text.

This change adds an alternate layout for the progress_dialog on
watches so that we can use a small spinner to make our text fit
better.

BUG: 18388692
BUG: 16493311
Change-Id: I2537aa2c1ee6329838c9c0c16f511c944fa86050
2015-03-23 13:17:35 -07:00
Geoff Mendal
eded942430 Import translations. DO NOT MERGE
Change-Id: I911df3cb6476017bb6723403dbabb2dfbfc4bce2
Auto-generated-cl: translation import
2015-03-23 05:38:24 -07:00
Griff Hazen
38f75097ff am 0b42ff79: Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev
* commit '0b42ff7916e6cc32c812a3be8f3e4ebdf96e8553':
  Allow emulator to select a window outset bottom
2015-03-22 00:05:48 +00:00
Griff Hazen
0b42ff7916 Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev 2015-03-21 23:59:46 +00:00
Alan Viverette
19537c0a18 am 38fcaf40: Merge "Move arrow_pointer hotspot to better match actual tip"
* commit '38fcaf4037a50225b931551a48c898c7b0bb4db2':
  Move arrow_pointer hotspot to better match actual tip
2015-03-21 20:20:48 +00:00
Alan Viverette
38fcaf4037 Merge "Move arrow_pointer hotspot to better match actual tip" 2015-03-21 20:06:57 +00:00
Geoff Mendal
1f9bad3cb9 Import translations. DO NOT MERGE
Change-Id: I59ad105e99dbd4c8bd19c4e94eecd6e19425345a
Auto-generated-cl: translation import
2015-03-20 23:15:45 -07:00
Alex Klyubin
2110a28a6c am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy."
* commit 'a4c4c575c793d3ba4847107b15ce3a9dd5395878':
  Add android.security.NetworkSecurityPolicy.
2015-03-20 18:08:30 +00:00
Alex Klyubin
a4c4c575c7 Merge "Add android.security.NetworkSecurityPolicy." 2015-03-20 17:56:25 +00:00
Alex Klyubin
f9034cc4ae Add android.security.NetworkSecurityPolicy.
The initial purpose of the NetworkSecurityPolicy class is to provide a
way for network libraries to check whether cleartext network traffic
(e.g., HTTP, WebSockets, XMPP, IMAP, SMTP) should be blocked from this
process.

The policy is set declaratively by the app developer in the app's
manifest and can be queried from ApplicationInfo.flags. Unfortunately,
several network stacks (bundled and unbundled) do not have a reference
to ApplicationInfo or Context.

Alternatives:
* Keep this API hidden (and thus potentially move it from framework to
  libcore), thus precluding unbundled HTTP stacks from using the API.
* Introduce a new java.lang.System property instead of this API.
  However, such properties are a mess and not as powerful/extensible
  as a public class.

Bug: 19215516
Change-Id: If22056a74d257bf1d805ebb4fc284240b3d338f1
2015-03-19 10:27:48 -07:00
Mathieu Chartier
05844d573f am b7d997a7: Merge "Revert "Change jit properties to be debug properties""
* commit 'b7d997a7b79c233869fdd5ad18b013caad4a7236':
  Revert "Change jit properties to be debug properties"
2015-03-19 16:58:59 +00:00
Mathieu Chartier
b7d997a7b7 Merge "Revert "Change jit properties to be debug properties"" 2015-03-19 16:44:59 +00:00
Alex Klyubin
d71f548f48 am 4177b8cb: Merge "Add app-level usesCleartextTraffic manifest attribute."
* commit '4177b8cbbfa239d68a9283124638d9399a5dd0de':
  Add app-level usesCleartextTraffic manifest attribute.
2015-03-19 16:21:40 +00:00
Alex Klyubin
4177b8cbbf Merge "Add app-level usesCleartextTraffic manifest attribute." 2015-03-19 16:10:20 +00:00
Vinod Krishnan
7a2df74b11 am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev
* commit '3f782ad156d337c7c6c542696ddc67ae82fa7a84':
  Make Theme.Micro point to Theme.Material
2015-03-19 09:42:46 +00:00
Vinod Krishnan
3f782ad156 Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev 2015-03-19 09:36:37 +00:00
Mathieu Chartier
1fb7aab9b2 Revert "Change jit properties to be debug properties"
Bug: 19735273

This reverts commit 1ad10ef1e4b83ef9e845761a82e202bb57e2379d.

Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
2015-03-18 19:07:02 -07:00
Shawn Willden
1bed39a5e4 am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE."
* commit 'e921b8a28f0d5b69fbb30374241c62fa90e92013':
  Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.
2015-03-19 00:42:09 +00:00
Shawn Willden
615f39f911 am 254c58c4: Merge changes Id9a22ad3,I629ab2c4
* commit '254c58c4e760e0af132d680fbd783a38ef436435':
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
2015-03-19 00:41:58 +00:00
Shawn Willden
e90774ddbc Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.
Also change to an ENUM, to match changes in keymaster_defs.h

Change-Id: Ieda3402563b0b9e4e8b100eb69a94651e51c6347
2015-03-18 18:28:39 -06:00
Shawn Willden
254c58c4e7 Merge changes Id9a22ad3,I629ab2c4
* changes:
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
2015-03-19 00:27:38 +00:00
Bryce Lee
8b8a045133 am 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev
* commit '8bc23e82af040334af4f2af1dae9898cc8c66df8':
  Add Assist global action for wear to different from VOICE_ASSIST
2015-03-19 00:21:13 +00:00
Bryce Lee
8bc23e82af Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev 2015-03-19 00:14:07 +00:00
Mathieu Chartier
f792e01606 am 437ac8f8: Merge "Add JIT late override property"
* commit '437ac8f8445b078041171eff56ce7ffbd1cf6766':
  Add JIT late override property
2015-03-18 23:09:21 +00:00
Mathieu Chartier
437ac8f844 Merge "Add JIT late override property" 2015-03-18 22:56:55 +00:00
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
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
13dbc3d48d Merge "Frameworks/base: Fix potential NPE in InputMethod" 2015-03-18 22:19:58 +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
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
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
0a3963c7b1 Import translations. DO NOT MERGE
Change-Id: I20b86613eb30cf53d0a421068cb3a93e63750c9f
Auto-generated-cl: translation import
2015-03-18 08:00:13 -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
4976e2de8d Frameworks/base: Fix visibility flag in Editor
Fix double check.

Bug: 19797138
Change-Id: I95e694f384f1f25d6cf3b6a1669052940385e41d
2015-03-17 16:08:43 -07:00
Andreas Gampe
d6f25364ee am 9568772a: Merge "Frameworks/base: Fix format string in Geofence"
* commit '9568772acbf5b36f2edb41f7c5b06d499329add0':
  Frameworks/base: Fix format string in Geofence
2015-03-17 21:42:55 +00:00
Andreas Gampe
9568772acb Merge "Frameworks/base: Fix format string in Geofence" 2015-03-17 21:30:49 +00:00
Andreas Gampe
1414a6291d Frameworks/base: Fix format string in Geofence
%p is not a valid conversion in format strings. It is also superfluous,
as it is already known that location is null.

Bug: 19797138
Change-Id: I5784e28b05b4ca9aac57e0fc9da4a7f01d9b3247
2015-03-17 21:30:20 +00:00
Kenny Root
693ea60e9e Track change to Conscrypt
Change way in which an outside caller can get the preferred SSLContext.

(cherry picked from commit 8a970637208207955fb6a719bd82902384b3c743)

Bug: 19798387
Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
2015-03-17 21:27:05 +00:00
Andreas Gampe
3814163b6d am aae42eb2: Merge "Frameworks/base: Fix format string in Camera"
* commit 'aae42eb26176482b09f0846e6acf7efa844a0d23':
  Frameworks/base: Fix format string in Camera
2015-03-17 21:05:48 +00:00
Andreas Gampe
aae42eb261 Merge "Frameworks/base: Fix format string in Camera" 2015-03-17 20:52:21 +00:00
Andreas Gampe
02ffb2aad9 Frameworks/base: Fix format string in Camera
One cannot print a boolean with %d. That will result in an exception.

Bug: 19797138
Change-Id: I86c42ea834cebebaecff8463637cc9de14d1fc88
2015-03-17 20:51:38 +00:00
Andreas Gampe
e4bdf3c1c9 am be549f9b: Merge "Frameworks/base: Fix precedence bug"
* commit 'be549f9b8e01f884a2cc2d668457c6b1c12ff4cc':
  Frameworks/base: Fix precedence bug
2015-03-17 20:49:18 +00:00
Andreas Gampe
c8484abbbd am 0ae488e1: Merge "Frameworks/base: Use || instead of |"
* commit '0ae488e1cb64318906397a40d8be4866e81e4860':
  Frameworks/base: Use || instead of |
2015-03-17 20:41:04 +00:00
Andreas Gampe
17eda7d0be am 4d907643: Merge "Frameworks/base: Fix trivial equals implementation"
* commit '4d9076437c0270cd863493f505e734a3108e89ea':
  Frameworks/base: Fix trivial equals implementation
2015-03-17 20:40:58 +00:00
Andreas Gampe
be549f9b8e Merge "Frameworks/base: Fix precedence bug" 2015-03-17 20:36:21 +00:00
Andreas Gampe
869d26fda0 Frameworks/base: Fix precedence bug
Explicit cast has higher precedence than shift.

Bug: 19797138
Change-Id: Ifcf569bf774fbf65ee50c078f736ad167bcc6b8c
2015-03-17 20:31:22 +00:00
Andreas Gampe
0ae488e1cb Merge "Frameworks/base: Use || instead of |" 2015-03-17 20:28:53 +00:00
Andreas Gampe
e1b9262084 Frameworks/base: Use || instead of |
Nothing wrong with | in this case, but || is canonical.

Bug: 19797138
Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f
2015-03-17 20:27:42 +00:00
Andreas Gampe
4d9076437c Merge "Frameworks/base: Fix trivial equals implementation" 2015-03-17 20:25:20 +00:00