OSDN Git Service
Nick Kralevich [Sat, 5 Jul 2014 16:41:54 +0000 (16:41 +0000)]
Merge "Fix a typo in a javadoc comment"
Nick Kralevich [Sat, 5 Jul 2014 16:40:50 +0000 (16:40 +0000)]
Merge "Fix typo in DevicePolicyManager documentation"
Nick Kralevich [Sat, 5 Jul 2014 16:30:08 +0000 (16:30 +0000)]
Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2""
Nick Kralevich [Sat, 5 Jul 2014 16:18:31 +0000 (16:18 +0000)]
Merge "Typo fix in permission string"
Narayan Kamath [Fri, 4 Jul 2014 08:41:17 +0000 (08:41 +0000)]
Merge "fix AudioTrack and AudioRecord JNI"
Eric Laurent [Wed, 30 Apr 2014 18:59:21 +0000 (11:59 -0700)]
fix AudioTrack and AudioRecord JNI
AudioTrack and AudioRecord JNI should not cast
jshortArray to jbyteArray. This appeared to work with Dalvik
but causes data corruption with ART.
(cherry picked from commit
9d02848e902d04417df616354db3a18c03e639b7)
Change-Id: Ie36624d3ea06042373c64edced4b5e30b7b1ee86
Narayan Kamath [Fri, 4 Jul 2014 08:23:08 +0000 (08:23 +0000)]
Merge "Fix LocalePicker locale filtering."
Narayan Kamath [Thu, 3 Jul 2014 12:26:07 +0000 (13:26 +0100)]
Fix LocalePicker locale filtering.
This was broken by commit
b27c137087ee92674 which
removed a badly phrased check. Prior to that commit,
there was a check that excluded locales whose toString()
length was not 5.
This change reinstates that check in a less roundabout
way, by excluding BCP-47 tags that don't have a country
subtag.
bug:
16038949
Change-Id: Ic24b1df87b2e2ce47d9ae04c7759088721f27b4f
Brian Duff [Thu, 3 Jul 2014 06:05:07 +0000 (06:05 +0000)]
Merge "Fix a typo in NumberPicker javadoc."
Narayan Kamath [Wed, 2 Jul 2014 08:09:01 +0000 (08:09 +0000)]
Merge "Fix broken assumptions in LocalePicker."
Narayan Kamath [Wed, 2 Jul 2014 08:08:36 +0000 (08:08 +0000)]
Merge "Remove bogus 2 char limit for locales and countries."
Narayan Kamath [Wed, 2 Jul 2014 12:07:57 +0000 (12:07 +0000)]
Merge "Fix native crashes when APKs can't be opened."
Narayan Kamath [Wed, 2 Jul 2014 09:54:25 +0000 (09:54 +0000)]
Merge "Fall back to "tl" if "fil" is absent."
Narayan Kamath [Thu, 26 Jun 2014 15:01:28 +0000 (16:01 +0100)]
Fall back to "tl" if "fil" is absent.
For JB-MR1, there was a hack that used "tl" where
we really meant "fil" because ICU didn't have localizations
for "fil". This has now been fixed, and we now support 3 letter
language codes for AAPT so we can use "fil" where required.
For the benefit of apps that need to target older platforms,
we fall back to "tl" if the app has assets for "tl" and the
resource locale is "fil".
See bugs
7291355,
7207176 and
8049507 for more context.
Change-Id: I1ac8502525f99b40f9091d5efd2df33518d47a41
Brian Carlstrom [Tue, 1 Jul 2014 22:25:58 +0000 (22:25 +0000)]
Merge "Add profiler type options"
Nick Kralevich [Tue, 1 Jul 2014 21:09:28 +0000 (21:09 +0000)]
Merge "Allow different SELinux policies for third party apps."
Robert Craig [Tue, 1 Jul 2014 20:53:11 +0000 (13:53 -0700)]
Allow different SELinux policies for third party apps.
Prior support forced all third party apps
to be resolved against the default stanza
of the mac_permissions.xml file when assigning
seinfo labels. This meant that all third party
apps, in effect, were untrusted regardless of
cert and therefore received the same selinux domain.
This also had the unfortunate side effect of forcing
certain third party apps into the wrong domains
because of shared userid requests among apps.
This patch removes that restriction and instead
allows all apps, regardless of location, to be
matched against the full mac_permissions.xml
policy file. This then allows all apps signed
with known good certs to receive the same selinux
domains of other apps with whom they share trust.
Change-Id: Iba569c046135c0e81140faf6296c5da26a243037
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Marco Nelissen [Tue, 1 Jul 2014 18:10:37 +0000 (18:10 +0000)]
Merge "Make sure we clean up"
Narayan Kamath [Tue, 1 Jul 2014 11:44:51 +0000 (12:44 +0100)]
Remove bogus 2 char limit for locales and countries.
Locale settings are persisted to system properties
and not to system settings, so the values read here
are used pretty much everywhere.
bug:
15873165
bug:
10090157
Change-Id: Ie7cda166439112c615afbd38253cf4fbb5791242
Narayan Kamath [Tue, 1 Jul 2014 09:56:20 +0000 (10:56 +0100)]
Fix broken assumptions in LocalePicker.
This code assumed that the locale is always 5 chars in
length and was of the form xx-YY. This is not necessarily
true. The language can be 3 letters in length and the locale
might have a script and variant.
Also cleans up several nasty pieces of code and eliminates
unnecessary array copies and improves readability by using
idiomatic java.
bug:
15873165
bug:
10090157
Change-Id: Iab1cfd7b78e5772b1245654f2153caf63a96033d
Narayan Kamath [Thu, 12 Jun 2014 16:19:43 +0000 (17:19 +0100)]
Fix native crashes when APKs can't be opened.
There was lax / incomplete error checking around the
construction of Apk handles. This change changes the ApkHandle
API and makes it throw IOException if the zipfile couldn't
be opened.
Additionally :
- Fix a resource leak in DefaultContainerService
- Report errors correctly during package moves.
bug:
15563874
Change-Id: Ic71a10709eb82b8f53405bbfb2320e80aa96b771
Narayan Kamath [Tue, 1 Jul 2014 09:17:41 +0000 (09:17 +0000)]
Merge "Fix packing of values at offset 16."
Narayan Kamath [Mon, 30 Jun 2014 14:59:39 +0000 (15:59 +0100)]
Fix packing of values at offset 16.
Our bitmask for setting the highest bit to 0 for
0b11100000 (0xef) instead of
0b01111111 (0x7f) so
we would end up setting bit 5 of each offset to
zero. Fix this and expand test coverage by adding
a fake language (tgp) that has this bit set in both
its bytes.
This issue was discovered while adding CTS tests for
"tgl".
Change-Id: Ibb6de03000951c907c252049771039ab7466187a
Jason Sams [Thu, 26 Jun 2014 00:13:17 +0000 (00:13 +0000)]
Merge "Add check and throw for failed Intrinsic init."
Wei Jin [Mon, 9 Jun 2014 23:29:54 +0000 (16:29 -0700)]
Add profiler type options
This is related to the CL that adds a new type of profile data.
Change-Id: I3e4e502da8e1b0dd9b32ddcbc5d11eca0d1ba2e5
Stephen Hines [Wed, 25 Jun 2014 20:33:39 +0000 (20:33 +0000)]
Merge "Switch from size_t -> uint32_t for dimensions array."
Stephen Hines [Wed, 25 Jun 2014 07:03:39 +0000 (00:03 -0700)]
Switch from size_t -> uint32_t for dimensions array.
Change-Id: I159586e98dd47be9b9f5db0f3e27d1072533134c
Narayan Kamath [Tue, 24 Jun 2014 14:16:04 +0000 (14:16 +0000)]
Merge "Memory leak in parsePackage"
Narayan Kamath [Tue, 24 Jun 2014 12:07:45 +0000 (12:07 +0000)]
Merge "Explicitly list out the list of cache subdirs to prune."
Narayan Kamath [Tue, 24 Jun 2014 10:03:08 +0000 (10:03 +0000)]
Merge "Update javadoc for android.os.Bundle."
Stephen Hines [Tue, 24 Jun 2014 00:57:44 +0000 (00:57 +0000)]
Merge "We need to update mPos when we copy a FieldPacker via its data[] member."
Stephen Hines [Tue, 24 Jun 2014 00:35:04 +0000 (17:35 -0700)]
We need to update mPos when we copy a FieldPacker via its data[] member.
Bug:
15756600
This change also adds a TODO/FIXME related to subAlign() and our tracking
mechanism for it. We need to further investigate how to make subAlign() work
properly if a user copies their FieldPacker.
Change-Id: I861e529abd11e378f7c73b510d7f418b940fe480
Jason Sams [Mon, 23 Jun 2014 22:15:08 +0000 (15:15 -0700)]
Add check and throw for failed Intrinsic init.
Change-Id: Icd53b3edd8e887d3692e5815dc0c38cd68b7aeb1
Robert Greenwalt [Mon, 23 Jun 2014 21:56:52 +0000 (21:56 +0000)]
Merge "DO NOT MERGE refactor wifi p2p's startDhcpServer function"
Jianzheng Zhou [Sat, 8 Feb 2014 04:43:07 +0000 (12:43 +0800)]
DO NOT MERGE refactor wifi p2p's startDhcpServer function
Add getTetheredDhcpRanges() interface and call it before calling
mNwService.startTethering() to update dhcp ranges. This will allow p2p app
to run well concurrently with other tethering app(e.g. usb tethering).
Change-Id: I5e8ffeb5d2d396f48b897cd9396f133e25ecca57
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
Marco Nelissen [Mon, 23 Jun 2014 21:41:32 +0000 (21:41 +0000)]
Merge "Fix thumbnail bug"
Henrik Baard [Wed, 18 Jun 2014 11:34:01 +0000 (13:34 +0200)]
Memory leak in parsePackage
The method parsePackage failes to delete some resources
in case of failures.
Added delete of "package" in the cases that was previously
missed.
Change-Id: I183e9ec5864c5ed18bb48410ab41317cb3d96bda
Marco Nelissen [Fri, 20 Jun 2014 21:05:02 +0000 (14:05 -0700)]
Fix thumbnail bug
When there was no thumbnail for a given image, the getThumbNail() convenience
method could return a previously-returned thumbnail instead of null.
b/
15771860
https://code.google.com/p/android/issues/detail?id=40714
Change-Id: Ibd18e048145bf347469f800afdf436247ea6b693
Calin Juravle [Mon, 23 Jun 2014 17:23:02 +0000 (17:23 +0000)]
Merge "Fix the initialization of some profile properties"
Brian Carlstrom [Mon, 23 Jun 2014 15:40:47 +0000 (15:40 +0000)]
Merge "Treat missing package usage data as a separate case"
Craig Mautner [Mon, 23 Jun 2014 14:49:08 +0000 (14:49 +0000)]
Merge "Fix frontOfTask assignment."
Danny Baumann [Sun, 22 Jun 2014 14:55:36 +0000 (16:55 +0200)]
Fix frontOfTask assignment.
If all activities of a given stack were finishing, no activity was
marked as front-of-task. This confused ActivityManager, so make sure
there's always exactly one activity marked as front-of-task.
Change-Id: I087cbe10280d4a60aa5ccfaefe24a223523fb3f2
Brian Carlstrom [Thu, 19 Jun 2014 16:38:06 +0000 (09:38 -0700)]
Treat missing package usage data as a separate case
Bug:
15520936
Change-Id: I8e1c6921973f84af7ee94de91721cc4a3436ebaf
Dan Albert [Fri, 20 Jun 2014 19:51:20 +0000 (19:51 +0000)]
Merge "Use openssl's SHA1 instead of bionic's."
Elliott Hughes [Fri, 20 Jun 2014 16:26:45 +0000 (16:26 +0000)]
Merge "Fixed VM memory leak in AudioSystem JNI interface"
Calin Juravle [Thu, 19 Jun 2014 17:51:47 +0000 (18:51 +0100)]
Fix the initialization of some profile properties
Change-Id: I959cb53f262cfb9d1621e4cd99bec05514f7f11f
Narayan Kamath [Thu, 19 Jun 2014 09:46:00 +0000 (10:46 +0100)]
Update javadoc for android.os.Bundle.
Call out the fact that defaultValue is returned if a null
mapping exists for a given key.
bug: https://code.google.com/p/android/issues/detail?id=68453
Change-Id: Ifa6e94c1dee47809f70cadcb668cb98cb8dbef14
Stephen Hines [Thu, 19 Jun 2014 03:04:32 +0000 (03:04 +0000)]
Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP."
Jeff Sharkey [Thu, 19 Jun 2014 16:02:11 +0000 (16:02 +0000)]
Merge "Fixing parcel leaks to avoid virtual memory leak"
Maunik Shah [Thu, 19 Jun 2014 08:48:39 +0000 (14:18 +0530)]
Fixing parcel leaks to avoid virtual memory leak
Client has to call recycle() on parcel object after its usage
otherwise native layer of binder won't clear the resources of
parcel which were allocated for IPC
Change-Id: Ib31ddcc92aa4ebd80bb66729922b9133692e9c9e
Brian Carlstrom [Thu, 19 Jun 2014 01:59:38 +0000 (01:59 +0000)]
Merge "Switch from core to core-libart"
Brian Carlstrom [Wed, 18 Jun 2014 22:11:01 +0000 (15:11 -0700)]
Switch from core to core-libart
Bug:
14298175
Change-Id: I89db18bf3d88f9511cb2ad943c64ecdbaf09d96f
Denver Coneybeare [Wed, 18 Jun 2014 19:45:14 +0000 (15:45 -0400)]
Fix javadoc typo in Message.java: "arg1" -> "arg2"
Change-Id: I245eadaf322dce9e27af30d8dbb6d97ca0d296ce
Stephen Hines [Wed, 18 Jun 2014 00:25:04 +0000 (17:25 -0700)]
Create FieldPacker.getPos() to get the actual amount of data used for FP.
We need larger buffers to handle 64-bit RS object types, but 32-bit code
will never fill all of the getData().length bytes. This allows us to retain
our verification code.
We have to modify an existing use of FieldPacker that was doing partial
updates of the underlying buffer. This was really relying on the old data
to be implicitly selected and written back, but that is not guaranteed by
the original API. This also required a fix to the FieldPacker.reset() API,
which was not allowing the FieldPacker to ever point to the final entry in
its buffer.
Change-Id: Idcd52790ac2b0ab1eff3f043e7eec2832953f04b
Colin Cross [Tue, 17 Jun 2014 22:40:26 +0000 (22:40 +0000)]
Merge "Fix reading memory usage for 64-bit processes"
Colin Cross [Tue, 17 Jun 2014 22:18:07 +0000 (15:18 -0700)]
Fix reading memory usage for 64-bit processes
64-bit process will have virtual addresses that don't fit in an
unsigned long if ActivityManagerService is in a 32-bit process,
and the locations of the '-' and ' ' characters in the maps
are not predictable. Fix the sscanf for finding the start of the
mapping, and use it again to find the end of the mapping. Also
fix a few 64-bit warnings.
Change-Id: I8855c76085142768be1d45346f1032fd37cbe4eb
Jason Sams [Wed, 18 Jun 2014 21:21:29 +0000 (21:21 +0000)]
Merge "Fix element size on 64b"
Jason Sams [Wed, 18 Jun 2014 20:17:57 +0000 (13:17 -0700)]
Fix element size on 64b
RenderScript Element types know their own size. This
change properly tracks the new object sizes.
Change-Id: I3cbf76a7ec5f68056ed5599e9406cea05ba86969
Narayan Kamath [Tue, 17 Jun 2014 11:59:46 +0000 (12:59 +0100)]
Explicitly list out the list of cache subdirs to prune.
We don't want directories like profiles and the former
profile-cache from being included in the prune. SELinux would
have prevented the move, but that's very brittle.
bug:
15677279
Change-Id: I2ff5db056757ffacaf108bb07b02dc0cac7172dd
Adam Lesinski [Tue, 17 Jun 2014 18:48:24 +0000 (18:48 +0000)]
Merge "[Asset Manager] Fix memory leakage bug"
Dan Albert [Mon, 16 Jun 2014 22:23:37 +0000 (15:23 -0700)]
Use openssl's SHA1 instead of bionic's.
Bionic is removing its SHA1.
Change-Id: I2b2d028223d2299666511a683cffba29c55639b7
Chris Craik [Mon, 16 Jun 2014 23:37:12 +0000 (23:37 +0000)]
Merge "Fix the texture ID reuse issue in HWUI."
Chris Craik [Mon, 16 Jun 2014 23:37:07 +0000 (23:37 +0000)]
Merge "hwui: fix possible null pointer de-refrence"
Colin Cross [Fri, 13 Jun 2014 19:58:55 +0000 (12:58 -0700)]
clean up native com.android.internal.os.Zygote
This is never compiled for the host any more, so remove all the
unnecesarry ifdefs.
Change-Id: I757e6d604b7f41476ac1021f5bdbc777eac6f99e
Colin Cross [Mon, 16 Jun 2014 20:08:30 +0000 (20:08 +0000)]
Merge "clean up native com.android.internal.os.Zygote"
Tenghui Zhu [Mon, 16 Jun 2014 17:08:42 +0000 (17:08 +0000)]
Merge "update parameters in uploadToTexture() for GLES20"
sean_lu [Mon, 16 Jun 2014 07:11:29 +0000 (15:11 +0800)]
[Asset Manager] Fix memory leakage bug
Symptom: memory leakage
Root Cause: new SortedVector but not free it in native cpp
Solution: free the SortedVector
Project: AOSP
Note:
Change-Id: Iab5a7f2e8d8509631301e7231427927d4797c856
jiayuanr [Tue, 10 Jun 2014 09:41:49 +0000 (17:41 +0800)]
Fix the texture ID reuse issue in HWUI.
Issue: When the layer of previous frame is destroyed, it doesn't clear the
texture id in mBoundTextures[mTextureUnit], so in the next frame, if
glGenTexture returns same texture ID of the previous frame,
the new texture is not bound.
CRs-fixed: 671736
Change-Id: Ifc5fd2115fb1863b3c006ab14b0faabeaeb4eab4
Nick Kralevich [Sat, 14 Jun 2014 04:21:13 +0000 (04:21 +0000)]
Merge "update mLastSlash for gdbserver"
Nick Kralevich [Fri, 13 Jun 2014 23:24:58 +0000 (16:24 -0700)]
update mLastSlash for gdbserver
the gdbserver special case wasn't updating mLastSlash. Fix it.
Change-Id: I63d64bb5f543bd2df6183649cf727e830731e144
Digish Pandya [Thu, 12 Jun 2014 05:12:54 +0000 (10:42 +0530)]
hwui: fix possible null pointer de-refrence
add layer check for null before de-refrencing it.
link: http://code.google.com/p/android/issues/detail?id=61622
Change-Id: I54fc21ec594effcfb1eededd80dd5b0b52645c4c
Lu, Shenghua [Wed, 27 Nov 2013 12:16:43 +0000 (20:16 +0800)]
update parameters in uploadToTexture() for GLES20
Google optimized the uploadToTexture with GLES3.0+,
This allows us to upload a sub-rectangle of texture,
but this has compliance issue with GLES 2.0.
With OpenGL ES 2.0 we need to copy the bitmap in a
temporary buffer if the stride doesn't match the width,
and then upload entire temporary stripes.
Change-Id: I8987cd8347913c61b7fa45bd47be1189aa6bdb05
Signed-off-by: Shenghua Lu <shenghua.lu@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Guobin Zhang<guobin.zhang@intel.com>
Tim Murray [Thu, 12 Jun 2014 23:02:48 +0000 (23:02 +0000)]
Merge "Move FieldPacker over to use large objects on 64-bit."
Tim Murray [Thu, 12 Jun 2014 21:17:53 +0000 (14:17 -0700)]
Move FieldPacker over to use large objects on 64-bit.
Change-Id: I1d4d502a3f9d86c6cf0f516cc087b1457f86ac28
Nick Kralevich [Thu, 12 Jun 2014 21:00:53 +0000 (21:00 +0000)]
Merge "Add service_contexts to policy update bundles."
Riley Spahn [Wed, 11 Jun 2014 22:26:28 +0000 (15:26 -0700)]
Add service_contexts to policy update bundles.
Add service_context file to SELinuxPolicyInstallReceiver
to allow updating.
Bug:
12909011
Change-Id: Ic0ad89958cc750413787d57e0f51363212a8730b
Elliott Hughes [Wed, 11 Jun 2014 23:59:33 +0000 (23:59 +0000)]
Merge "Switch to a type-safe album art interface."
Elliott Hughes [Tue, 10 Jun 2014 23:53:31 +0000 (16:53 -0700)]
Switch to a type-safe album art interface.
(Requires a matching change in frameworks/av.)
Bug:
15514223
Change-Id: I4e494cc5d7a2eb82cd2b7ae3b829fc663136267a
Calin Juravle [Wed, 11 Jun 2014 17:25:10 +0000 (17:25 +0000)]
Merge "Shrink profiler.start-immediately to fit in the maximum property size"
Calin Juravle [Wed, 11 Jun 2014 17:21:41 +0000 (18:21 +0100)]
Shrink profiler.start-immediately to fit in the maximum property size
Change-Id: I25f24f5e5b128aa6a300bdc1008427451bd9cecf
Narayan Kamath [Mon, 16 Jun 2014 09:41:37 +0000 (09:41 +0000)]
Merge "Remove some pointless code."
Narayan Kamath [Fri, 13 Jun 2014 16:46:47 +0000 (17:46 +0100)]
Remove some pointless code.
Unnecessary disk reads for values that are never
used (and cached elsewhere, so that optimization is
rendered pointless).
Change-Id: Ic14a8b53a96908bb03eae28759d7be2c217e8125
Narayan Kamath [Mon, 16 Jun 2014 09:36:03 +0000 (09:36 +0000)]
Merge "Support deprecated language codes."
Narayan Kamath [Wed, 5 Mar 2014 18:42:23 +0000 (18:42 +0000)]
Support deprecated language codes.
Locale.toLanguageTag will transform the obsolete (and
deprecated) language codes "in", "ji" and "iw" to
"id", "yi" and "he" respectively.
All versions of android prior to "L" used the deprecated
language tags, so we will need to support them for backwards
compatibility.
bug:
13230947
(cherry-picked from commit
21fc8ba39c4799a346caf95)
(also contains a partial cherry-pick of
857ba4af because
including it is the easiest way to avoid conflicts.)
Change-Id: Ia1d0f2d8e20f5679ff3990506f6468ebf789c94a
Narayan Kamath [Mon, 16 Jun 2014 13:46:27 +0000 (13:46 +0000)]
Merge "Move dex file pruning to installd."
Narayan Kamath [Tue, 10 Jun 2014 12:59:10 +0000 (13:59 +0100)]
Move dex file pruning to installd.
Companion change for commit
7dbf95cd7606e22267
in frameworks/native.
bug:
14407732
Change-Id: I520aa3950fb6b87c7ca5a805e597d734496407d3
Narayan Kamath [Mon, 16 Jun 2014 10:50:04 +0000 (10:50 +0000)]
Merge "Track changes to libcore ICU apis."
Narayan Kamath [Thu, 12 Jun 2014 12:42:05 +0000 (13:42 +0100)]
Track changes to libcore ICU apis.
All private APIs that earlier accepted Locale.toString
now accept Locale instances.
Change-Id: I80df88d0c928e921320b6545b1267adecefe64af
Calin Juravle [Wed, 11 Jun 2014 17:25:02 +0000 (17:25 +0000)]
Merge "Improved profile.start-immediately comment"
Calin Juravle [Tue, 10 Jun 2014 13:52:24 +0000 (14:52 +0100)]
Improved profile.start-immediately comment
Change-Id: I41bda6a1cd99cb0a8230961e0462a41cb552887e
Elliott Hughes [Mon, 9 Jun 2014 16:26:27 +0000 (16:26 +0000)]
Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."
Elliott Hughes [Mon, 9 Jun 2014 16:22:58 +0000 (09:22 -0700)]
Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
Change-Id: I1acb4d5df71daa47ea87813db3941fd3c676cfb5
Robin Lee [Mon, 9 Jun 2014 12:47:08 +0000 (12:47 +0000)]
Merge "Choose CA certificate storage according to userId"
Robin Lee [Fri, 25 Apr 2014 13:57:49 +0000 (14:57 +0100)]
Choose CA certificate storage according to userId
Sets the default CA certificate directory at first instantiation so
that only certificates for the current user are searched.
This means that if one user decides to trust a CA no other user of the
device will be forced into trusting that CA as well.
Change-Id: Iaca14a94dd14c598e49a598290e1a80917269eac
Calin Juravle [Mon, 9 Jun 2014 09:18:23 +0000 (09:18 +0000)]
Merge "Fixed comments related to profile properties."
Calin Juravle [Fri, 6 Jun 2014 15:00:53 +0000 (16:00 +0100)]
Fixed comments related to profile properties.
Change-Id: Idd6de8fe2a193a36cf1ea6bcadacb3289973c5ab
Ian Rogers [Fri, 6 Jun 2014 19:34:12 +0000 (19:34 +0000)]
Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]"
Calin Juravle [Fri, 6 Jun 2014 12:06:36 +0000 (12:06 +0000)]
Merge "Add missing profiler options."
Calin Juravle [Mon, 2 Jun 2014 15:45:13 +0000 (16:45 +0100)]
Add missing profiler options.
Bug:
12877748
Change-Id: I311b8fb7e15d512e65631bc2a52c443a271d3d3f
Deepanshu Gupta [Mon, 31 Mar 2014 23:11:13 +0000 (16:11 -0700)]
Add missing dependency in layoutlib build file [DO NOT MERGE]
Add missing dependency on built_ext_data
Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry picked from commit
e345507ca4b7b83c6e0446788f4404eb697f945b)