OSDN Git Service
Przemyslaw Szczepaniak [Tue, 3 Nov 2015 09:47:56 +0000 (09:47 +0000)]
Move StrictJarFile from libcore to framework
Bug:
25337946
(cherry picked from commit
8a7c1606d88873c5a1b5764c16cb046b6f2275b2)
Change-Id: I1bfce4129887d7cbfc02d92641b44920d7cdbbee
Przemyslaw Szczepaniak [Thu, 9 Jul 2015 12:28:30 +0000 (13:28 +0100)]
Switch RecoverySystem impl to use sun.security.pkcs
Due to org.apache.harmony.security package removal,
RecoverySystem#verifyPackage was rewritten to use
sun.security.pkcs package for verifining package
signature.
(cherry picked from commit
9ad08ec5be0d1e225c9f463fd395ba852b6b5bba)
Change-Id: I04848ad8f045f87224f9d30ff8dd745aac6d08fd
Przemyslaw Szczepaniak [Thu, 19 Nov 2015 16:39:03 +0000 (16:39 +0000)]
API update for OpenJdk based libcore
(cherry picked from commit
7e1fb09d0b8e94f55509c65aca797c467c810f89)
Change-Id: Idc1639d3bc751c5fa738bc661e6bb8077240bd3b
Narayan Kamath [Mon, 27 Jul 2015 13:02:11 +0000 (14:02 +0100)]
Use libcore/known_oj_tags for the javadoc stage.
Helps us process (and discard) OpenJdk specific javadoc tags.
(cherry picked from commit
2c4f2843f4aa904c27dc78086bff039dbd295959)
Change-Id: Ib90ce70509fefa24608067db18cfc21c6c5d0590
Przemyslaw Szczepaniak [Wed, 18 Nov 2015 15:03:13 +0000 (15:03 +0000)]
Stop preloading fortress classes
(cherry picked from commit
f1e520169309f1303d4383298dd5644df59efe4b)
Change-Id: I4fd13c4dc373482c1235b54746fdf7f029a80dc2
Przemyslaw Szczepaniak [Thu, 15 Oct 2015 10:04:19 +0000 (11:04 +0100)]
Use HexDump instead of java.lang.IntegralToString
java.lang.IntegralToString is being removed, replaced
all its usage by com.android.internal.util.HexDump.
(cherry picked from commit
3f72604be806c0173b5dca0225cadf6e7c872147)
Change-Id: I0527d580f5975dca0dfaa6f86fa3695dd49d0849
Piotr Jastrzebski [Tue, 17 Feb 2015 16:58:52 +0000 (16:58 +0000)]
Add core-oj to the list of core library jars.
With some core classes moved to separate core-oj jar
we need to use the new jar.
(cherry picked from commit
cfa292e1dad184648bf673167f3f35b4fb34fc93)
Change-Id: Iba481c3df029902a2bd0f9661d0819f4a191b2aa
Dimitry Ivanov [Mon, 21 Dec 2015 23:10:49 +0000 (23:10 +0000)]
Merge "Use shared namespace for bundled app classloader"
Chad Brubaker [Mon, 21 Dec 2015 18:52:48 +0000 (18:52 +0000)]
Merge "Add hostname aware isCleartextTrafficPermitted"
Calin Juravle [Mon, 21 Dec 2015 09:43:34 +0000 (09:43 +0000)]
Merge "Pass app's code paths to the runtime"
Dimitry Ivanov [Sat, 12 Dec 2015 01:34:21 +0000 (17:34 -0800)]
Use shared namespace for bundled app classloader
Allow bundled apps to reference platform native libraries
located in subdirectories of the default library path
(/system/lib/hw/* for example).
In addition to this bundled apps need to share native
libraries with default namespace. Added parameter to
ApplicationLoaders.createClassLoader() to do just that.
Bug:
26165097
Bug:
26164393
(cherry picked from commit
75b10ecccdd1881390075dd22c1d4f9bdf1c5828)
Change-Id: I836e5fed4713f2a605a5de673c40970ef6d988dd
Nick Kralevich [Sat, 19 Dec 2015 06:58:58 +0000 (06:58 +0000)]
Merge "common_time_server.cpp: more O_CLOEXEC"
Nick Kralevich [Sat, 19 Dec 2015 04:47:02 +0000 (20:47 -0800)]
common_time_server.cpp: more O_CLOEXEC
Change-Id: I2185a462d72e11f5a015c525d2d37c52ecc3e430
Ying Wang [Thu, 17 Dec 2015 19:10:13 +0000 (19:10 +0000)]
Merge "Fix typo in config.xml file"
Łukasz Nowicki [Thu, 17 Dec 2015 15:22:30 +0000 (15:22 +0000)]
Fix typo in config.xml file
Change-Id: I5902c410ced9418278e0ccf847eac8ea1d70bafe
Calin Juravle [Thu, 10 Dec 2015 17:32:15 +0000 (17:32 +0000)]
Pass app's code paths to the runtime
The runtime needs the application's main code paths so it know for which
dex files to record the profile.
Bug:
26080105
Change-Id: I5f2cb5c140aa6893ac78bc0d5897e33764569e5b
Samuel Tan [Thu, 17 Dec 2015 00:35:58 +0000 (00:35 +0000)]
Merge "Add comments to keep Java and native binder PersistableBundle in sync"
Samuel Tan [Thu, 17 Dec 2015 00:35:43 +0000 (00:35 +0000)]
Merge "Fix PersistableBundle handling in Parcel.writeValue"
Samuel Tan [Thu, 17 Dec 2015 00:35:35 +0000 (00:35 +0000)]
Merge "Specify path for native PersistableBundle implementation"
Eino-Ville Talvala [Wed, 16 Dec 2015 23:01:43 +0000 (23:01 +0000)]
Merge "Revert "Camera2: create new streams if surface size has changed""
Yin-Chia Yeh [Wed, 16 Dec 2015 22:50:48 +0000 (22:50 +0000)]
Revert "Camera2: create new streams if surface size has changed"
This change is redundant after the following change is merged:
Camera2: Handle surface size change
When comparing if two OutputConfigurations are equal, also check
the width, height, format, dataspace when the output configurations
were created. With this, CameraDeviceImpl knows that the surface has
changed sizes and will reconfigure the stream.
Bug:
12250682
Change-Id: I4216260a0a08ad87b835ed97e9eaddf1df317fcc
This reverts commit
f49f8b0bad0c6cd5db1b603233ad008c5bac4a60.
Eino-Ville Talvala [Wed, 16 Dec 2015 22:18:13 +0000 (22:18 +0000)]
Merge "Camera2: create new streams if surface size has changed"
John Reck [Wed, 16 Dec 2015 18:27:24 +0000 (18:27 +0000)]
Merge "libhwui: make setSurface asynchronous"
Samuel Tan [Mon, 14 Dec 2015 21:29:17 +0000 (13:29 -0800)]
Add comments to keep Java and native binder PersistableBundle in sync
Add comments stating that certain methods of the Java binder framework
should be kept in sync with the corresponding methods mirrored in the
native PersistableBundle implementation.
BUG:
25815410
Change-Id: I475b2e9a527291eea58c8178cd733c444dfcfed5
Samuel Tan [Sat, 12 Dec 2015 00:50:58 +0000 (16:50 -0800)]
Fix PersistableBundle handling in Parcel.writeValue
Previously, in Parcel.writeValue, PersistableBundle objects
would be handled as Parcelable types, since we check for
the Parcelable type before the PersistableBundle type (and
PersistableBundle implements the Parcelable interface).
Fix this by moving the PersistableBundle type "if" condition
above the Parcealble type "if" condition. Also, add a comment
that explicitly states this nuance, in order to prevent future
regressions.
BUG:
25815410
Change-Id: Ia86aa5fc39423422342df0609a0d37e7f38d7ddd
Samuel Tan [Tue, 1 Dec 2015 02:17:19 +0000 (18:17 -0800)]
Specify path for native PersistableBundle implementation
Specify path for native PersistableBundle implementation in
PersistableBundle.aidl.
BUG:
25815410
Change-Id: If29b06604b938805d5250fe80e54ef9ea1e88365
Greg Hackmann [Mon, 14 Dec 2015 21:12:52 +0000 (21:12 +0000)]
Merge "Trace SQLite operations"
Greg Hackmann [Mon, 1 Dec 2014 22:31:21 +0000 (14:31 -0800)]
Trace SQLite operations
Inefficient SQLite use can have non-obvious effects on performance. For
example, insert and update operations can trigger a surprising number of
fsync() calls, especially if they're not grouped together into
transactions.
Add tracepoints around SQLite operations, to make it easier to pinpoint
their effects on the rest of the system.
Change-Id: I30cc3d02eca264e46dcc09ca7512a32519543834
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Chad Brubaker [Mon, 14 Dec 2015 19:31:08 +0000 (19:31 +0000)]
Merge "Use the application's usesCleartextTraffic flag"
Chad Brubaker [Mon, 14 Dec 2015 19:30:44 +0000 (19:30 +0000)]
Merge "Check for null hostnames in RootTrustManager"
Svetoslav Ganov [Mon, 14 Dec 2015 17:53:15 +0000 (17:53 +0000)]
Merge "Change signature|system permissions to signature|privileged"
Michael Wright [Mon, 14 Dec 2015 17:38:58 +0000 (17:38 +0000)]
Merge "Customize auto-brightness parameters"
Zoran Jovanovic [Thu, 10 Dec 2015 16:01:16 +0000 (17:01 +0100)]
Customize auto-brightness parameters
Auto-brightness parameters are device dependent so they should be
configurable.
The common issue with original values manifests as the screen being
perceived as too bright in dark rooms with minimum brightness and
also laginess on backlight change.
Change-Id: I2b040608bca73a3397c65c24d3b28a1514499ae6
Julia Reynolds [Mon, 14 Dec 2015 16:39:49 +0000 (16:39 +0000)]
Merge "Fix volume expand arrow to be displayed correctly"
Alexander Toresson [Mon, 14 Dec 2015 15:10:04 +0000 (16:10 +0100)]
Fix volume expand arrow to be displayed correctly
Sometimes, the volume control expand arrow would be displayed
incorrectly. When different apps use different volume controls and
force different orientations, the position of the arrow (expand button)
will not be updated correctly. When this happens the arrow cannot be
pressed and the volume settings cannot be expanded.
The underlying reason is that onLayoutChange only compares the old
dimensions of a view with the new dimensions, which doesn't take into
account that the last time onLayoutChange was run it may have been run
for a different view (a different volume control), in which case the
dimensions of the new view may not have changed, but the arrow needs to
be repositioned anyway as it needs to be positioned in relation to
another view.
Fix this problem by storing the last stream (volume control) that the
arrow was positioned in relation to, and checking if we're positioning
in relation to the same stream the next time the position of the arrow
is updated.
Change-Id: Id23e7605d50857292e09c1909b3e27f01bdf5e22
Yury Zhauniarovich [Sun, 13 Dec 2015 17:01:03 +0000 (20:01 +0300)]
Change signature|system permissions to signature|privileged
Permission protection level changed from signature|system,
which is deprecated to signature|privileged.
Change-Id: I697723221617f8c12255d6911d34cd1bf96eff8b
Signed-off-by: Yury Zhauniarovich <y.zhalnerovich@gmail.com>
John Reck [Fri, 11 Dec 2015 20:37:36 +0000 (20:37 +0000)]
Merge "Fix memory leak in HWUI"
Chad Brubaker [Fri, 11 Dec 2015 20:35:11 +0000 (12:35 -0800)]
Use the application's usesCleartextTraffic flag
When no config is specified use the application's usesCleartextTraffic
flag when building the default config.
Change-Id: I07378f88da47b49f63e9089fca7f1e99efede272
Dimitry Ivanov [Fri, 11 Dec 2015 20:30:32 +0000 (20:30 +0000)]
Merge "Use nativeloader to load NativeActivity"
Dmitriy Ivanov [Sun, 15 Nov 2015 22:58:36 +0000 (14:58 -0800)]
Use nativeloader to load NativeActivity
System apps are the exception and they can
access internal platform libraries (this
is needed for bundled apps to work correctly).
Also fix the way NativeActivity loads the native
library to correspond to the way BaseDexClassloader
does it.
Bug: http://b/
22548808
Bub: http://b/
25777936
Change-Id: Idc94cdded182ea2cb1cbebc76c336cc3394c7ebe
Chad Brubaker [Fri, 11 Dec 2015 18:02:34 +0000 (18:02 +0000)]
Merge "Add null check to getConfigForHostname"
Sangkyu Lee [Fri, 11 Dec 2015 07:05:10 +0000 (16:05 +0900)]
Fix memory leak in HWUI
std::unique_ptr::release just releases the ownership of the
managed object. To delete the object, std::unique_ptr::reset
function should be called.
Change-Id: If65f74085b1fc2be3a9fffc433326e0bcdb40ff3
Chad Brubaker [Fri, 11 Dec 2015 02:32:40 +0000 (18:32 -0800)]
Check for null hostnames in RootTrustManager
Even if the hostname aware method is called if the hostname is null then
the destination is unknown and the configuration can be ambiguous.
Change-Id: I7cacbd57a42604933fdc882371f143dc0a20902d
Chad Brubaker [Fri, 11 Dec 2015 02:12:59 +0000 (18:12 -0800)]
Add null check to getConfigForHostname
bug:
26144676
Change-Id: I18f50940846f1ce8109560c63ce2a87ce084d9e5
Chad Brubaker [Wed, 9 Dec 2015 22:58:01 +0000 (14:58 -0800)]
Add hostname aware isCleartextTrafficPermitted
Change-Id: I22b9ea277407846f9c333ce0cc37c25a2be1381e
Matthew Williams [Thu, 10 Dec 2015 18:04:44 +0000 (18:04 +0000)]
Merge "ConcurrentModificationException in SyncManager"
Mikael Persson [Thu, 26 Nov 2015 11:34:29 +0000 (12:34 +0100)]
Camera2: create new streams if surface size has changed
When a new capture session is created, the old streams
are re-used if same surface and rotation. However, if the
surface has changed size, we must re-create the stream
to ensure HAL is configured properly, which includes
setting up proper sensor resolution.
This is an issue in e.g. CTS testNoiseReductionModes
and testEdgeModeControl, where a new preview with different
size can be setup without first stopping the previous one.
The same preview surface is used here, but with changed size.
Change-Id: I3b88a95209e83cf1cef0f4d1f791c87b0feb093f
Signed-off-by: Mikael Persson <mikael.persson@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Thomas Buhot [Fri, 4 Dec 2015 11:18:03 +0000 (12:18 +0100)]
libhwui: make setSurface asynchronous
On the critical path of the cold launch of applications
the main thread of the started application tells the RenderThread
to create a surface. This process is synchronous and blocks
the main thread of the application until the creation
of the EGLContext is complete.
As a consequence the launch time of the application is delayed
by time spent allocating the EGL Context in the RenderThread.
With this optimization the launch time of any application
is improved (for example settings by 20 to 40 ms).
Change-Id: Ibf47aaa0abb8dedf7aa00693073db3785d9d6b08
Signed-off-by: Thomas Buhot <thomas.buhot@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Eino-Ville Talvala [Wed, 9 Dec 2015 21:14:21 +0000 (21:14 +0000)]
Merge "Replace hard-coded errno values with OsConstants"
Chad Brubaker [Wed, 9 Dec 2015 20:53:01 +0000 (20:53 +0000)]
Merge "Use a custom TrustedCertificateStore"
Chad Brubaker [Wed, 9 Dec 2015 20:52:50 +0000 (20:52 +0000)]
Merge "Expose findByIssuerAndSignature"
Chad Brubaker [Wed, 9 Dec 2015 18:40:55 +0000 (18:40 +0000)]
Merge "Refactor NetworkSecurityPolicy to be pluggable"
Christopher Wiley [Tue, 8 Dec 2015 23:15:52 +0000 (23:15 +0000)]
Merge "Rethrow remote's ServiceSpecificException"
Chad Brubaker [Tue, 8 Dec 2015 21:37:28 +0000 (13:37 -0800)]
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
Paul Duffin [Tue, 8 Dec 2015 14:11:45 +0000 (14:11 +0000)]
Merge "Remove framework from LOCAL_JAVA_LIBRARIES"
am:
e252149ab9
* commit '
e252149ab99a008a0a75734326755cadd5c5ee7a':
Remove framework from LOCAL_JAVA_LIBRARIES
Paul Duffin [Tue, 8 Dec 2015 14:10:09 +0000 (14:10 +0000)]
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
Paul Duffin [Tue, 8 Dec 2015 14:04:29 +0000 (14:04 +0000)]
Merge "Remove framework from LOCAL_JAVA_LIBRARIES"
Paul Duffin [Tue, 8 Dec 2015 14:03:10 +0000 (14:03 +0000)]
Merge "Follow-up to Switch to the latest version of Caliper"
Paul Duffin [Tue, 8 Dec 2015 13:51:27 +0000 (13:51 +0000)]
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
Andreas Gampe [Tue, 8 Dec 2015 02:24:08 +0000 (18:24 -0800)]
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
振淦王 [Tue, 1 Dec 2015 08:37:31 +0000 (16:37 +0800)]
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>
Neil Fuller [Tue, 8 Dec 2015 10:47:59 +0000 (10:47 +0000)]
Merge "Add ICU4J APIs for Android"
am:
cb02371ca7
* commit '
cb02371ca70a81796c75bd3bbf88478caf6ea7b7':
Add ICU4J APIs for Android
Neil Fuller [Tue, 8 Dec 2015 10:42:51 +0000 (10:42 +0000)]
Merge "Add ICU4J APIs for Android"
Michael Wright [Mon, 7 Dec 2015 23:19:53 +0000 (23:19 +0000)]
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
Samuel Tan [Mon, 7 Dec 2015 23:15:15 +0000 (23:15 +0000)]
Merge "Add support for reading and writing double array values"
am:
61c0b7cd4d
* commit '
61c0b7cd4d73381a2f4e3d3836389b130b5006d9':
Add support for reading and writing double array values
Paul Duffin [Mon, 7 Dec 2015 23:12:48 +0000 (23:12 +0000)]
Merge "Switch to the latest version of Caliper"
am:
ae119af517
* commit '
ae119af517fc427ead5bd6a3394b3b1f92df790d':
Switch to the latest version of Caliper
Michael Wright [Mon, 7 Dec 2015 21:34:59 +0000 (21:34 +0000)]
Merge "Add support for locking the screen when the lid is closed"
Samuel Tan [Mon, 7 Dec 2015 18:56:01 +0000 (18:56 +0000)]
Merge "Add support for reading and writing double array values"
Neil Fuller [Tue, 10 Nov 2015 13:14:07 +0000 (13:14 +0000)]
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
Paul Duffin [Mon, 7 Dec 2015 13:34:27 +0000 (13:34 +0000)]
Merge "Switch to the latest version of Caliper"
Paul Duffin [Tue, 1 Dec 2015 15:41:36 +0000 (15:41 +0000)]
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
Elliott Hughes [Sat, 5 Dec 2015 01:36:53 +0000 (01:36 +0000)]
Merge "Track rename from base/ to android-base/."
am:
9f6a2ae67c
* commit '
9f6a2ae67c70085d550962829e6bfe76706907d8':
Track rename from base/ to android-base/.
Elliott Hughes [Sat, 5 Dec 2015 01:30:46 +0000 (01:30 +0000)]
Merge "Track rename from base/ to android-base/."
Christopher Wiley [Mon, 23 Nov 2015 01:12:37 +0000 (17:12 -0800)]
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
Elliott Hughes [Fri, 4 Dec 2015 23:33:35 +0000 (15:33 -0800)]
Track rename from base/ to android-base/.
Change-Id: I31be831de812052d1c0d4c0781178d0756124bcf
Edward Savage-Jones [Fri, 13 Nov 2015 12:27:03 +0000 (13:27 +0100)]
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
Lazar Trsic [Tue, 7 Jul 2015 15:31:20 +0000 (17:31 +0200)]
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
Phil Burk [Fri, 4 Dec 2015 01:18:51 +0000 (01:18 +0000)]
Merge "USB MIDI: Fix race condition that causes intermittent connections."
am:
1c9bdfd029
* commit '
1c9bdfd0294cd1b13470ae6443bfa2ad425bd7dd':
USB MIDI: Fix race condition that causes intermittent connections.
Phil Burk [Fri, 4 Dec 2015 01:12:01 +0000 (01:12 +0000)]
Merge "USB MIDI: Fix race condition that causes intermittent connections."
Phil Burk [Fri, 4 Dec 2015 01:00:42 +0000 (17:00 -0800)]
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>
Jeff Sharkey [Thu, 3 Dec 2015 23:11:51 +0000 (23:11 +0000)]
Merge "Allow customisation of advanced settings in DocumentsUI"
am:
f1b325c1ec
* commit '
f1b325c1ec41c09f6efeb3d7709e7e7af93eacb8':
Allow customisation of advanced settings in DocumentsUI
Jeff Sharkey [Thu, 3 Dec 2015 23:04:29 +0000 (23:04 +0000)]
Merge "Allow customisation of advanced settings in DocumentsUI"
Edward Savage-Jones [Tue, 21 Jan 2014 14:45:44 +0000 (15:45 +0100)]
Allow customisation of advanced settings in DocumentsUI
Enables the customisation of the default value of the DocumentsUI
'advanced' setting using overlays.
Change-Id: I240cbb845d15ab2ea6ae7a79a17b4f51905fdb9c
Alex Klyubin [Thu, 3 Dec 2015 21:18:38 +0000 (21:18 +0000)]
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.
Alex Klyubin [Thu, 3 Dec 2015 21:10:46 +0000 (21:10 +0000)]
Merge "Stop using 512 bit RSA keys in keyset unit tests."
Alex Klyubin [Thu, 3 Dec 2015 20:52:23 +0000 (12:52 -0800)]
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
Yohei Yukawa [Thu, 3 Dec 2015 19:10:30 +0000 (19:10 +0000)]
Merge "Fix special handling of a fake language code "tl"."
am:
9fd2af6b32
* commit '
9fd2af6b323ef98695701a8bcfdd3ca1c4dd7965':
Fix special handling of a fake language code "tl".
Yohei Yukawa [Thu, 3 Dec 2015 19:04:24 +0000 (19:04 +0000)]
Merge "Fix special handling of a fake language code "tl"."
Christopher Wiley [Thu, 3 Dec 2015 17:46:58 +0000 (17:46 +0000)]
Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException"
am:
0ded0da517
* commit '
0ded0da51743a24707bece4b0be05f49db3b9981':
Map Errors.h's UNEXPECTED_NULL to NullPointerException
Christopher Wiley [Thu, 3 Dec 2015 17:43:43 +0000 (17:43 +0000)]
Merge "Map Errors.h's UNEXPECTED_NULL to NullPointerException"
Jeff Sharkey [Thu, 3 Dec 2015 17:07:50 +0000 (17:07 +0000)]
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
Jeff Sharkey [Thu, 3 Dec 2015 17:06:57 +0000 (17:06 +0000)]
Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
Jeff Sharkey [Thu, 3 Dec 2015 17:06:24 +0000 (17:06 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
am:
29e0b6e789
* commit '
29e0b6e7891091614a9e9dd6083017d0c9d454ae':
StrictMode: fix deserialization of ViolationInfo on large stacks
Jeff Sharkey [Thu, 3 Dec 2015 17:05:16 +0000 (17:05 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
am:
29e0b6e789
* commit '
29e0b6e7891091614a9e9dd6083017d0c9d454ae':
StrictMode: fix deserialization of ViolationInfo on large stacks
Jeff Sharkey [Thu, 3 Dec 2015 17:03:53 +0000 (17:03 +0000)]
Merge "Fix race condition when collecting op callback."
am:
98844a97d2
* commit '
98844a97d2bd07146854783374ee3a19aed8edd5':
Fix race condition when collecting op callback.
Jeff Sharkey [Thu, 3 Dec 2015 17:02:21 +0000 (17:02 +0000)]
Merge "Improved variable naming"
am:
4ef9d41066
* commit '
4ef9d41066d8b4124c2c59752512adf24102634d':
Improved variable naming
Jeff Sharkey [Thu, 3 Dec 2015 16:59:58 +0000 (16:59 +0000)]
Merge "Avoid a double decrease of reference counter for unstable provider"
Jeff Sharkey [Thu, 3 Dec 2015 16:59:13 +0000 (16:59 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
Jeff Sharkey [Thu, 3 Dec 2015 16:58:34 +0000 (16:58 +0000)]
Merge "Fix race condition when collecting op callback."
Jeff Sharkey [Thu, 3 Dec 2015 16:58:03 +0000 (16:58 +0000)]
Merge "Improved variable naming"