Commit Graph

44986 Commits

Author SHA1 Message Date
47172f5365 Merge "Use parseColor instead of getHTMLColor" 2014-11-21 20:40:08 +00:00
9f285bd60b Merge "Tell installd when boot completes." 2014-11-20 10:47:17 +00:00
1228e58e88 Merge "[WebView] Interface to access hidden APIs. (DO NOT MERGE)" 2014-11-19 21:53:43 +00:00
e7cf27b664 [WebView] Interface to access hidden APIs. (DO NOT MERGE)
The WeView provider implementation needs access to
these APIs to implement the WebView functionality.

BUG:18152150

Change-Id: I6b41c623b1e8a776dcee8977d0d17259cb4b34f1
(cherry picked from commits 94ef789f0c
 and 53f2569487)
2014-11-19 21:47:13 +00:00
343f478241 Tell installd when boot completes.
installd can then clear the ".booting" marker from the dalvik-cache
(owned by root). This marker is used to detect boot loops.

bug: 18280671

(cherry picked from commit 76a748e62f)

Change-Id: I2364c05837ac04d428b5a34ab1802964a11d2df4
2014-11-19 14:41:08 +00:00
d843564331 Merge "PopupWindow: fix typo in doc comment" 2014-11-18 23:32:57 +00:00
d0c45355b9 Move preloaded-classes out of framework.jar.
Instead we install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.

Bug: 18305157
Change-Id: I22f1a1dd44f90268d02532bf18405768523c0b1b
2014-11-17 11:31:08 -08:00
a987d9af69 Use parseColor instead of getHTMLColor
getHTMLColor is not aware of ARGB color format which is commonly used in
android xml files. This causes problem with coloring spans in resources.

Instead of above it should be changed to parseColor() with supported
formats: #RRGGBB #AARRGGBB

Bug: https://code.google.com/p/android/issues/detail?id=58192

Change-Id: I16bdf4c5c2a3b5e216b44e5c1955cac0104b3e12
2014-11-07 21:22:06 +01:00
d00ced983e am b0cb0734: Merge "Track change to Conscrypt"
* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
  Track change to Conscrypt
2014-11-03 18:40:55 +00:00
b0cb07348e Merge "Track change to Conscrypt" 2014-11-03 18:34:00 +00:00
10ac55ba4f am 5f8099ed: Merge "Add java.util.List import."
* commit '5f8099ed181c2ba279c4a747096442389d5f8840':
  Add java.util.List import.
2014-11-03 16:00:57 +00:00
2b4378fef8 Add java.util.List import.
Unused on master but used downstream.

Change-Id: I7c072e25d1f7c3a645efb2986d23e81068dced22
2014-11-03 15:55:03 +00:00
2e1bd46a15 am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""
* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
  Revert "Revert "Remove unused apache related API.""
2014-11-03 14:31:11 +00:00
4b8f1846ca Revert "Revert "Remove unused apache related API.""
This reverts commit 31f54ef815.

Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
2014-11-03 13:32:10 +00:00
8a97063720 Track change to Conscrypt
Change way in which an outside caller can get the preferred SSLContext.

Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
2014-10-31 12:06:09 -07:00
fa945c105b am e87d36f8: Merge "Revert "Remove unused apache related API.""
* commit 'e87d36f8925a34f85ba80c886757d07ad03fed42':
  Revert "Remove unused apache related API."
2014-10-29 11:30:11 +00:00
d3389e2f32 resolved conflicts for merge of 9834af9c to stage-aosp-master
Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
2014-10-29 11:23:45 +00:00
87ce99ca72 am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."
* commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba':
  Migrate off timeFormat12 and timeFormat24.
2014-10-28 04:39:24 +00:00
31f54ef815 Revert "Remove unused apache related API."
This reverts commit 3f2714e18b.

Change-Id: Ie0e51897ab509d112dc37ca7b90b4139b0a82d8d
2014-10-27 16:55:14 +00:00
3f2714e18b Remove unused apache related API.
Hidden and used only in unit tests.

Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
2014-10-24 14:27:07 +01:00
ced7ebdb1d Merge "Migrate off timeFormat12 and timeFormat24." 2014-10-23 18:21:56 +00:00
f7d5e0a53e Migrate off timeFormat12 and timeFormat24.
libcore now offers a wider variety of 12-/24-hour time formats,
so be more specific about which one we want here.

(cherry-pick of 85f60d3a03b5b5d9a0e8b8a138eb85a6b53a1eca.)

Bug: 10361358
Change-Id: I846ab7a6f84cd49e876ad21e9366aff1600e0530
2014-10-23 11:18:21 -07:00
38b63f0ede am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"
* commit 'dfcf065505a12aa358af5cd2607fd355eee964c4':
  Replacing FloatMath native implementation with calls to Math
2014-10-20 10:16:08 +00:00
dfcf065505 am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"
* commit '09fd5a1873fa1ab51f4e428b1b909fea35091a51':
  Replacing FloatMath native implementation with calls to Math
2014-10-20 10:10:34 +00:00
09fd5a1873 Merge "Replacing FloatMath native implementation with calls to Math" 2014-10-20 10:08:11 +00:00
7b3db39aa4 Replacing FloatMath native implementation with calls to Math
On modern versions of Android running in AOT mode
FloatMath is slower than Math. Calls to Math.sqrt(),
etc. are replaced by intrinsics which can be as small
as a single CPU opcode.

When running in interpreted mode the new
implementation is unfortunately slower, but I'm
judging this acceptable and likely to be improved
over time. This change saves a small amount of native
code.

Example timings:

Mako AOSP AOT:

Method: Original / New / Direct call to Math
ceil: 596ns / 146.ns / 111ns
sqrt: 694ns / 56ns / 25ns

Mako AOSP interpreted:

Method: Original / New / Direct call to Math
ceil: 1900ns / 2307ns / 1485ns
sqrt: 1998ns / 2603ns / 1788ns

Other calls Mako AOT:

Method: Original / New
cos: 635ns / 270ns
exp: 566ns / 324ns
floor: 604ns / 150ns
hypot: 631ns / 232ns
pow: 936ns / 643ns
sin: 641ns / 299ns

The advice to use Math directly, in preference to
FloatMath, is still good. FloatMath will be deprecated
separately.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: If07fcbd78543d13bc6d75f9743f999860e8d58d7
2014-10-20 09:24:11 +01:00
5fc9f9c293 am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math""
* commit '84e6d466edc2aba711f90431a1cd209d11c0e70d':
  Revert "Replacing FloatMath native implementation with calls to Math"
2014-10-18 20:53:38 +00:00
84e6d466ed am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math""
* commit '4cd671e4d27befdd576fa86051956c3cafad6808':
  Revert "Replacing FloatMath native implementation with calls to Math"
2014-10-18 20:48:03 +00:00
4cd671e4d2 Merge "Revert "Replacing FloatMath native implementation with calls to Math"" 2014-10-18 20:43:07 +00:00
b3b68d0333 Revert "Replacing FloatMath native implementation with calls to Math"
This reverts commit 32b88b48da.

Change-Id: I40ea17f3a68f2b53eb013aebd3ba1becdc724f94
2014-10-18 20:41:27 +00:00
6fffe58bf4 am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev
* commit '15e7b2ac60b0e6355e6ed5c1be676744c23f5a0e':
  Translate compound button drawable by scroll position
2014-10-18 00:26:00 +00:00
15e7b2ac60 Merge "Translate compound button drawable by scroll position" into lmp-dev 2014-10-18 00:20:27 +00:00
b95c336d78 Translate compound button drawable by scroll position
BUG: 18028674
Change-Id: Iaba848642b87f0d134c6a6c57e5756d883e45904
2014-10-17 17:19:12 -07:00
527664c88c am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
* commit 'c6c843fbe8fb8d9bdd012a472e22970ee89b9d24':
  Add utility methods to LockPatternUtils for encryption
2014-10-17 23:52:44 +00:00
c6c843fbe8 Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 2014-10-17 23:48:21 +00:00
dd5de719c5 Add utility methods to LockPatternUtils for encryption
This enables a change in Settings that allows device
encryption to be disabled by the user.

Fixes bug 17881324

Change-Id: I34dfc586df1a598bf969dc82adf8537a2730d345
2014-10-17 16:08:21 -07:00
5ee758932a am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
* commit 'cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
  Accessibility no longer overrides strong encryption.
2014-10-17 23:04:13 +00:00
cd2b54e6e5 Merge "Accessibility no longer overrides strong encryption." into lmp-dev 2014-10-17 22:59:22 +00:00
e4444d0fd6 am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
* commit '84b4791aaf0384a334068a97c70fcda162cfadab':
  Modified lollipop Easter egg for TV compatibility
2014-10-17 22:04:44 +00:00
33f577cfea Modified lollipop Easter egg for TV compatibility
Bug: 17997922

Change-Id: I0e2e34245183cdd146ecca02ab09b2c4867770ec
2014-10-17 21:57:23 +00:00
a6711ff6f0 Accessibility no longer overrides strong encryption.
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.

bug:17881324

Change-Id: Ic60d760c267d3f934040a42e1963b179bd8b9f5f
2014-10-17 14:33:11 -07:00
3de84d0de6 am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev
* commit 'a865bb5df834194dee339db615c17d7c7b63aaa3':
  Use the correct method to check if device is encrypted
2014-10-17 18:58:58 +00:00
a865bb5df8 Merge "Use the correct method to check if device is encrypted" into lmp-dev 2014-10-17 18:55:58 +00:00
cd410ba4e8 Use the correct method to check if device is encrypted
DPM's method will return false if encrypted by default password,
preventing the changing of encryption password to lockscreen password.

Check if the device is encrypted by some means, instead.

Also fix a SecurityException when Device Admin queries encryption state
(recent regression)

Bug: 17881324
Change-Id: Id897e61c5e254ab3f8dc569285428a73005303ea
2014-10-17 11:43:57 -07:00
53cf2d4b9f am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev
* commit '52476989b8afc0e96c2218625031ed550b12c79b':
  SDK only: hide the old L API version constant.
2014-10-17 17:15:02 +00:00
5a135a1cbb am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references"
* commit '9b0109eb051fcf0a7ad801d03e73aa4e0bf2d7a7':
  Removing some more FloatMath references
2014-10-17 14:59:41 +00:00
9b0109eb05 am c7aa8fe6: Merge "Removing some more FloatMath references"
* commit 'c7aa8fe62356fc09962941140c8bb7ed8bab2f8f':
  Removing some more FloatMath references
2014-10-17 14:54:17 +00:00
c7aa8fe623 Merge "Removing some more FloatMath references" 2014-10-17 14:48:17 +00:00
d3511d4be1 SDK only: hide the old L API version constant.
Also update the LOLLIPOP version constant to describe more things
that change when you target it.

Change-Id: I15e2c26a0f997ff2bfc8dd5076c827da7f42ee66
2014-10-16 17:49:45 -07:00
e51f6f84e5 am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
* commit '248edc3e969217aec1fcce7f324cbae6c46da0a3':
  Update javadoc comments for getBluetoothLeAdvertiser()
2014-10-16 16:11:36 +00:00