120310 Commits

Author SHA1 Message Date
Narayan Kamath
d62196cfef am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
* commit '3fa99ec77ee52164575375c7709923c94d9693a6':
  Remove bogus 2 char limit for locales and countries.
2014-07-02 08:49:04 +00:00
Brian Carlstrom
8922ddbab1 am a6e06889: Merge "Add profiler type options"
* commit 'a6e06889fce7fbf2049f421daef02b8986736f77':
  Add profiler type options
2014-07-01 22:32:01 +00:00
Nick Kralevich
d172419e9a am 9b1a7d45: Merge "Allow different SELinux policies for third party apps."
* commit '9b1a7d4570dd692cf86c385dfcdf057ad966fa57':
  Allow different SELinux policies for third party apps.
2014-07-01 21:13:12 +00:00
Nick Kralevich
9b1a7d4570 Merge "Allow different SELinux policies for third party apps." 2014-07-01 19:16:01 +00:00
Robert Craig
83b54ecab7 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>
2014-07-01 13:53:11 -07:00
Marco Nelissen
899c15ef20 am db816cef: Merge "Make sure we clean up"
* commit 'db816cef0dd1f1988fbcf3c70a66f9c4acf73358':
  Make sure we clean up
2014-07-01 18:15:28 +00:00
Narayan Kamath
3fa99ec77e Merge "Remove bogus 2 char limit for locales and countries." 2014-07-01 17:52:00 +00:00
Marco Nelissen
db816cef0d Merge "Make sure we clean up" 2014-07-01 14:59:07 +00:00
Brian Carlstrom
a6e06889fc Merge "Add profiler type options" 2014-07-01 14:58:13 +00:00
Narayan Kamath
37151b5032 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
2014-07-01 13:50:18 +01:00
Narayan Kamath
7f319c47c8 am 1dc550fa: Merge "Fix packing of values at offset 16."
* commit '1dc550fa7333257a130d71866be37181f8ee553b':
  Fix packing of values at offset 16.
2014-07-01 09:22:10 +00:00
Narayan Kamath
1dc550fa73 Merge "Fix packing of values at offset 16." 2014-06-26 21:28:22 +00:00
Narayan Kamath
b297591622 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
2014-06-30 16:20:27 +01:00
Jason Sams
89e4c715e0 am 7165bd6d: Merge "Add check and throw for failed Intrinsic init."
* commit '7165bd6d7496159b426f072bdf13adfffc917a24':
  Add check and throw for failed Intrinsic init.
2014-06-26 00:20:26 +00:00
Stephen Hines
6d38cec12b am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."
* commit '924ed1fae19ba70b5c6267b977ae8c72b63fe99a':
  Switch from size_t -> uint32_t for dimensions array.
2014-06-25 20:44:09 +00:00
Jason Sams
7165bd6d74 Merge "Add check and throw for failed Intrinsic init." 2014-06-25 17:35:00 +00:00
Wei Jin
54fc18b925 Add profiler type options
This is related to the CL that adds a new type of profile data.

Change-Id: I3e4e502da8e1b0dd9b32ddcbc5d11eca0d1ba2e5
2014-06-24 12:16:55 -07:00
Narayan Kamath
b20b0629c2 am 71dfc7e9: Merge "Memory leak in parsePackage"
* commit '71dfc7e9accc1ca3cda52bdf475b03fa2a334e78':
  Memory leak in parsePackage
2014-06-24 14:21:14 +00:00
Narayan Kamath
22a32d8837 am 2a0f9e6a: Merge "Explicitly list out the list of cache subdirs to prune."
* commit '2a0f9e6a523abc28bdbc249010f5ddd184a27730':
  Explicitly list out the list of cache subdirs to prune.
2014-06-24 12:14:12 +00:00
Narayan Kamath
c141ae547e am 989ab6d3: Merge "Update javadoc for android.os.Bundle."
* commit '989ab6d38d77c0a1f7dc5e648e1950410d5d01d4':
  Update javadoc for android.os.Bundle.
2014-06-24 10:08:52 +00:00
Stephen Hines
924ed1fae1 Merge "Switch from size_t -> uint32_t for dimensions array." 2014-06-24 07:39:41 +00:00
Stephen Hines
bc5d3eeedc Switch from size_t -> uint32_t for dimensions array.
Change-Id: I159586e98dd47be9b9f5db0f3e27d1072533134c
2014-06-25 00:03:39 -07:00
Stephen Hines
db3bcfb8f7 am 44023a4f: Merge "We need to update mPos when we copy a FieldPacker via its data[] member."
* commit '44023a4f20a38ed892a6181765337635d77b1de8':
  We need to update mPos when we copy a FieldPacker via its data[] member.
2014-06-24 06:53:18 +00:00
Narayan Kamath
2a0f9e6a52 Merge "Explicitly list out the list of cache subdirs to prune." 2014-06-24 06:33:30 +00:00
Narayan Kamath
71dfc7e9ac Merge "Memory leak in parsePackage" 2014-06-24 06:22:45 +00:00
Narayan Kamath
989ab6d38d Merge "Update javadoc for android.os.Bundle." 2014-06-24 06:22:45 +00:00
Stephen Hines
44023a4f20 Merge "We need to update mPos when we copy a FieldPacker via its data[] member." 2014-06-24 00:37:45 +00:00
Stephen Hines
fcb3161e57 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
2014-06-23 17:35:04 -07:00
Jason Sams
1c8da1ccce Add check and throw for failed Intrinsic init.
Change-Id: Icd53b3edd8e887d3692e5815dc0c38cd68b7aeb1
2014-06-23 15:15:08 -07:00
Robert Greenwalt
a77d0ef49e am 0b572896: (-s ours) Merge "DO NOT MERGE refactor wifi p2p\'s startDhcpServer function"
* commit '0b57289678a4dc82fefa4894901af1be7f5cc3c6':
  DO NOT MERGE refactor wifi p2p's startDhcpServer function
2014-06-23 22:02:12 +00:00
Robert Greenwalt
0b57289678 Merge "DO NOT MERGE refactor wifi p2p's startDhcpServer function" 2014-06-23 21:56:07 +00:00
Marco Nelissen
c4d37f58a1 am 0eee8ac2: Merge "Fix thumbnail bug"
* commit '0eee8ac275927264f766bb18023365e83d4bfe5a':
  Fix thumbnail bug
2014-06-23 21:45:30 +00:00
Jianzheng Zhou
78c8e7c8bf 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>
2014-06-23 21:02:45 +00:00
Calin Juravle
3e8368350e am a06f5fa6: Merge "Fix the initialization of some profile properties"
* commit 'a06f5fa6563f7fc08b7bb2305f61bf649add0b5a':
  Fix the initialization of some profile properties
2014-06-23 17:26:29 +00:00
Brian Carlstrom
1b98ccf275 am 0924ef65: Merge "Treat missing package usage data as a separate case"
* commit '0924ef6592c3172db6ae1f3d92f845951f901486':
  Treat missing package usage data as a separate case
2014-06-23 15:43:40 +00:00
Craig Mautner
a2121e497c am 5957d6a8: Merge "Fix frontOfTask assignment."
* commit '5957d6a889d9c9e46d260d915b9ffa66a763dd23':
  Fix frontOfTask assignment.
2014-06-23 14:52:41 +00:00
Marco Nelissen
0eee8ac275 Merge "Fix thumbnail bug" 2014-06-23 14:50:49 +00:00
Henrik Baard
5f7ce10c93 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
2014-06-23 14:03:46 +02:00
Brian Carlstrom
0924ef6592 Merge "Treat missing package usage data as a separate case" 2014-06-21 03:13:40 +00:00
Marco Nelissen
b416af13e7 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
2014-06-20 14:10:00 -07:00
Craig Mautner
5957d6a889 Merge "Fix frontOfTask assignment." 2014-06-20 21:00:34 +00:00
Danny Baumann
ec4e780e5c 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
2014-06-23 08:43:37 +02:00
Dan Albert
a642a9ea3b am d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s."
* commit 'd24f557798d04bdd50f2a45e48b70b009a205b4a':
  Use openssl's SHA1 instead of bionic's.
2014-06-20 19:53:36 +00:00
Brian Carlstrom
0547ce55eb Treat missing package usage data as a separate case
Bug: 15520936
Change-Id: I8e1c6921973f84af7ee94de91721cc4a3436ebaf
2014-06-20 12:53:19 -07:00
Elliott Hughes
ff6b0e2472 am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface"
* commit 'f18961066b7029652dacb9016bacbf192a6cf73d':
  Fixed VM memory leak in AudioSystem JNI interface
2014-06-20 16:30:40 +00:00
Calin Juravle
a06f5fa656 Merge "Fix the initialization of some profile properties" 2014-06-20 03:03:45 +00:00
Dan Albert
d24f557798 Merge "Use openssl's SHA1 instead of bionic's." 2014-06-20 02:09:57 +00:00
Elliott Hughes
f18961066b Merge "Fixed VM memory leak in AudioSystem JNI interface" 2014-06-20 02:09:57 +00:00
Calin Juravle
e279cd6d21 Fix the initialization of some profile properties
Change-Id: I959cb53f262cfb9d1621e4cd99bec05514f7f11f
2014-06-19 18:51:47 +01:00
Jeff Sharkey
447b68e767 am b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak"
* commit 'b5e05cffccc2ca1ce85ce9952b6c6845b46aa5c7':
  Fixing parcel leaks to avoid virtual memory leak
2014-06-19 16:07:52 +00:00