213295 Commits

Author SHA1 Message Date
Chad Brubaker
b27d820920 Merge "Expose findByIssuerAndSignature" 2015-12-09 20:52:50 +00:00
Stephen Hines
b029bfbf4c Remove graphics-related RenderScript tests.
Bug: http://b/25497185

These APIs have been deprecated for quite some time, and it makes sense
to remove the obsolete tests.

Change-Id: Ief413633c49b304042e191fbc200901bf9a794ad
2015-12-09 11:03:38 -08:00
Chad Brubaker
224318aa13 Merge "Refactor NetworkSecurityPolicy to be pluggable" 2015-12-09 18:40:55 +00:00
Christopher Wiley
85eaca25fe Merge "Rethrow remote's ServiceSpecificException" 2015-12-08 23:15:52 +00:00
Chad Brubaker
6568cf185d Refactor NetworkSecurityPolicy to be pluggable
This allows us to keep the logic for the NetworkSecurityPolicy in the
framework instead of in libcore.

Change-Id: I4bf494f79c27729cb17d93d90a91319492270ce9
2015-12-08 13:38:43 -08:00
Paul Duffin
ec9081a004 Merge "Remove framework from LOCAL_JAVA_LIBRARIES"
am: e252149ab9

* commit 'e252149ab99a008a0a75734326755cadd5c5ee7a':
  Remove framework from LOCAL_JAVA_LIBRARIES
2015-12-08 14:11:45 +00:00
Paul Duffin
0ec9daecc6 Merge "Follow-up to Switch to the latest version of Caliper"
am: 80d5bef6f9

* commit '80d5bef6f9da4a0eeb23c3356843351170553df6':
  Follow-up to Switch to the latest version of Caliper
2015-12-08 14:10:09 +00:00
Paul Duffin
e252149ab9 Merge "Remove framework from LOCAL_JAVA_LIBRARIES" 2015-12-08 14:04:29 +00:00
Paul Duffin
80d5bef6f9 Merge "Follow-up to Switch to the latest version of Caliper" 2015-12-08 14:03:10 +00:00
Paul Duffin
b12a3fca7e Remove framework from LOCAL_JAVA_LIBRARIES
After previous change removed LOCAL_NO_STANDARD_LIBRARIES:=true
it is no longer necessary to explicitly add framework to
LOCAL_JAVA_LIBRARIES as it is added automatically by the build.

Change-Id: I68bf700375e34a10302f76d7463110755b815f85
2015-12-08 13:59:36 +00:00
Andreas Gampe
32f4043ac3 Follow-up to Switch to the latest version of Caliper
Remove LOCAL_NO_STANDARD_LIBRARIES.

(cherry pick from commit c9d6a91cd51a9b7ff00187914fe922b0d22b3d66)

Bug: 24848946
Change-Id: I19feea042c9b4823d4979f4d951476792600edbc
2015-12-08 13:58:08 +00:00
振淦王
60a7431816 ConcurrentModificationException in SyncManager
updateRunningAccounts and dispatchSyncOperation is running in different thread,
and mActiveSyncContexts not synchronization.
If methods occur together,
mActiveSyncContexts change may occur when cycle is running.

Sample:
https://code.google.com/p/android/issues/detail?id=195341

Solution:
Offboard the traversal from the main thread to the handler thread.

Change-Id: Ifb9fbb466a5087186be31f7877c50b8c8b6737e4
Signed-off-by: wangzhengan <wangzglx@gmail.com>
2015-12-08 21:40:27 +08:00
Neil Fuller
ec1349df9c Merge "Add ICU4J APIs for Android"
am: cb02371ca7

* commit 'cb02371ca70a81796c75bd3bbf88478caf6ea7b7':
  Add ICU4J APIs for Android
2015-12-08 10:47:59 +00:00
Neil Fuller
cb02371ca7 Merge "Add ICU4J APIs for Android" 2015-12-08 10:42:51 +00:00
Michael Wright
4d9e6190b1 Merge "Add support for locking the screen when the lid is closed"
am: 9dc3c36c9c

* commit '9dc3c36c9cd796d90b65543567495d910d266e4c':
  Add support for locking the screen when the lid is closed
2015-12-07 23:19:53 +00:00
Samuel Tan
ff8ef28e73 Merge "Add support for reading and writing double array values"
am: 61c0b7cd4d

* commit '61c0b7cd4d73381a2f4e3d3836389b130b5006d9':
  Add support for reading and writing double array values
2015-12-07 23:15:15 +00:00
Paul Duffin
5e2d958157 Merge "Switch to the latest version of Caliper"
am: ae119af517

* commit 'ae119af517fc427ead5bd6a3394b3b1f92df790d':
  Switch to the latest version of Caliper
2015-12-07 23:12:48 +00:00
Michael Wright
9dc3c36c9c Merge "Add support for locking the screen when the lid is closed" 2015-12-07 21:34:59 +00:00
Samuel Tan
61c0b7cd4d Merge "Add support for reading and writing double array values" 2015-12-07 18:56:01 +00:00
Neil Fuller
847f9f4293 Hide static setDefault methods in ICU4J
Associated with a change in external/icu.

Bug: 25924145
Change-Id: I3fea5e3d88417cfb702550147c0c33d1cd2d0dc9
2015-12-07 16:50:16 +00:00
Neil Fuller
ebd7735baa Add ICU4J APIs for Android
Add the planned set of new I18N public APIs for
Android N.

This APIs consists of a whitelisted subset of ICU4J APIs
repackaged under android.icu (not com.ibm.icu).

It includes no deprecated, provisional, internal methods from
ICU 56.

There may be future work to improve the ICU4J JavaDoc text
for Android, but the API surface area should be mostly
stable at this point.

Bug: 22023363
(cherry-picked from commit d7fa3e79f071696bd62182c01b62fe0ea1cc9587)

Change-Id: I6667acbbf7c5501e12ecfbdd560ea80283c0c831
2015-12-07 14:52:16 +00:00
Paul Duffin
ae119af517 Merge "Switch to the latest version of Caliper" 2015-12-07 13:34:27 +00:00
Paul Duffin
76a6cec97f Switch to the latest version of Caliper
Added an Android.mk file to core/tests/benchmarks to build the
benchmarks against caliper-api-target to ensure that they build
correctly. Changed the implementations to work with the new
version of Caliper.

Bug: 24848946
Change-Id: Ib28026816dbc5c1d54f65974f4a1abfee299c43f
2015-12-07 12:29:45 +00:00
Elliott Hughes
8aa8fe2c64 Merge "Track rename from base/ to android-base/."
am: 9f6a2ae67c

* commit '9f6a2ae67c70085d550962829e6bfe76706907d8':
  Track rename from base/ to android-base/.
2015-12-05 01:36:53 +00:00
Elliott Hughes
9f6a2ae67c Merge "Track rename from base/ to android-base/." 2015-12-05 01:30:46 +00:00
Christopher Wiley
80fd1208b9 Rethrow remote's ServiceSpecificException
Certain system services would like to throw exceptions
with specific error codes, so that the framework can catch
these specific conditions and express them appropriately.

Bug: 25800533
Change-Id: I94b3d30fa131f5e14bba893c971615840085459f
2015-12-04 16:06:08 -08:00
Elliott Hughes
be5474da4b Track rename from base/ to android-base/.
Change-Id: I31be831de812052d1c0d4c0781178d0756124bcf
2015-12-04 15:33:35 -08:00
Edward Savage-Jones
7def60daa0 Add support for locking the screen when the lid is closed
This commit adds configurable support for lockscreen
behaviour when the user has a device cover/lid.  This
is intended for lids with a viewing window so that the
user can see the time and interact with apps via the
window.

Change-Id: Id71883f66d1a180c4732912b3b59cabf9f4d7b6e
2015-12-04 18:26:31 +01:00
Lazar Trsic
8ea56f6851 Replace hard-coded errno values with OsConstants
Errno values have been hard-coded inside java code. On the native side
however, bionic's errno.h is used (through utils/Errors.h). Some of
the numbers are architecture dependent (EOPNOTSUPP, ETIMEDOUT...).

This causes Camera app to crash on MIPS devices. There is a check for
expected errors, in CameraBinderDecorator.throwOnError, but the error
(EOPNOTSUPP) is not recognized and an exception is thrown.

Change-Id: I8bcac8f1ced50c76614f566a6e624967a18a25e1
2015-12-04 12:41:37 +01:00
Phil Burk
ec719f1509 Merge "USB MIDI: Fix race condition that causes intermittent connections."
am: 1c9bdfd029

* commit '1c9bdfd0294cd1b13470ae6443bfa2ad425bd7dd':
  USB MIDI: Fix race condition that causes intermittent connections.
2015-12-04 01:18:51 +00:00
Phil Burk
1c9bdfd029 Merge "USB MIDI: Fix race condition that causes intermittent connections." 2015-12-04 01:12:01 +00:00
Phil Burk
1852019c39 USB MIDI: Fix race condition that causes intermittent connections.
Plugging in a USB MIDI device normally works.
But occasionally the device is not seen due to a race condition.
This code retries until the device is ready.

Change-Id: Ifba9c9678e6be0c3d139f3467f895307096a2ad8
Signed-off-by: Phil Burk <philburk@google.com>
2015-12-03 17:00:42 -08:00
Jeff Sharkey
f2a3c341ab Merge "Allow customisation of advanced settings in DocumentsUI"
am: f1b325c1ec

* commit 'f1b325c1ec41c09f6efeb3d7709e7e7af93eacb8':
  Allow customisation of advanced settings in DocumentsUI
2015-12-03 23:11:51 +00:00
Jeff Sharkey
f1b325c1ec Merge "Allow customisation of advanced settings in DocumentsUI" 2015-12-03 23:04:29 +00:00
Edward Savage-Jones
827dec0e48 Allow customisation of advanced settings in DocumentsUI
Enables the customisation of the default value of the DocumentsUI
'advanced' setting using overlays.

Change-Id: I240cbb845d15ab2ea6ae7a79a17b4f51905fdb9c
2015-12-03 23:02:47 +00:00
Alex Klyubin
b1e7f6d287 Merge "Stop using 512 bit RSA keys in keyset unit tests."
am: 59c9bfd41b

* commit '59c9bfd41bfe7d897a1a5d2e35d8dd48322c9865':
  Stop using 512 bit RSA keys in keyset unit tests.
2015-12-03 21:18:38 +00:00
Alex Klyubin
59c9bfd41b Merge "Stop using 512 bit RSA keys in keyset unit tests." 2015-12-03 21:10:46 +00:00
Alex Klyubin
377e70ae9f Stop using 512 bit RSA keys in keyset unit tests.
This switches keyset unit tests from two unrealistically short 512 bit
RSA keys to a more realistic 2048 bit RSA key and a NIST P-256 EC key.

Change-Id: If615b97dff22a2a4f7f0e6015e410e98b8d395cd
2015-12-03 12:52:23 -08:00
Yohei Yukawa
30e321b54a Merge "Fix special handling of a fake language code "tl"."
am: 9fd2af6b32

* commit '9fd2af6b323ef98695701a8bcfdd3ca1c4dd7965':
  Fix special handling of a fake language code "tl".
2015-12-03 19:10:30 +00:00
Yohei Yukawa
9fd2af6b32 Merge "Fix special handling of a fake language code "tl"." 2015-12-03 19:04:24 +00:00
Christopher Wiley
4ff2cc0898 Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException"
am: 0ded0da517

* commit '0ded0da51743a24707bece4b0be05f49db3b9981':
  Map Errors.h's UNEXPECTED_NULL to NullPointerException
2015-12-03 17:46:58 +00:00
Christopher Wiley
0ded0da517 Merge "Map Errors.h's UNEXPECTED_NULL to NullPointerException" 2015-12-03 17:43:43 +00:00
Jeff Sharkey
aae0a49c16 Merge "Avoid a double decrease of reference counter for unstable provider"
am: e8651aed4b

* commit 'e8651aed4b8a2c6703589069e26f5be750b2a947':
  Avoid a double decrease of reference counter for unstable provider
2015-12-03 17:07:50 +00:00
Jeff Sharkey
67003be3f8 Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master 2015-12-03 17:06:57 +00:00
Jeff Sharkey
af588a31bc Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
am: 29e0b6e789

* commit '29e0b6e7891091614a9e9dd6083017d0c9d454ae':
  StrictMode: fix deserialization of ViolationInfo on large stacks
2015-12-03 17:06:24 +00:00
Jeff Sharkey
d5cefab28c Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
am: 29e0b6e789

* commit '29e0b6e7891091614a9e9dd6083017d0c9d454ae':
  StrictMode: fix deserialization of ViolationInfo on large stacks
2015-12-03 17:05:16 +00:00
Jeff Sharkey
678011854b Merge "Fix race condition when collecting op callback."
am: 98844a97d2

* commit '98844a97d2bd07146854783374ee3a19aed8edd5':
  Fix race condition when collecting op callback.
2015-12-03 17:03:53 +00:00
Jeff Sharkey
bc57510e9f Merge "Improved variable naming"
am: 4ef9d41066

* commit '4ef9d41066d8b4124c2c59752512adf24102634d':
  Improved variable naming
2015-12-03 17:02:21 +00:00
Jeff Sharkey
e8651aed4b Merge "Avoid a double decrease of reference counter for unstable provider" 2015-12-03 16:59:58 +00:00
Jeff Sharkey
29e0b6e789 Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" 2015-12-03 16:59:13 +00:00