OSDN Git Service
Stephen Hines [Tue, 8 Jul 2014 21:25:19 +0000 (21:25 +0000)]
am
70a3c558: Merge "Adds support for multi-input kernels to Frameworks/Base/RS."
* commit '
70a3c558645f8e693ce37577fdd61b8d1fd4ed9a':
Adds support for multi-input kernels to Frameworks/Base/RS.
Robert Greenwalt [Tue, 8 Jul 2014 16:59:17 +0000 (16:59 +0000)]
am
912700fc: Merge "Add Telefonica/Movistar specific APN details for dun"
* commit '
912700fca8e02fe93fca7d95ef22472f77349ffe':
Add Telefonica/Movistar specific APN details for dun
Craig Mautner [Mon, 7 Jul 2014 21:19:45 +0000 (21:19 +0000)]
am
08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."
* commit '
08881385a86bf887669a555ae03759c374ec9c50':
[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.
Brian Carlstrom [Mon, 7 Jul 2014 20:55:16 +0000 (20:55 +0000)]
Robert Greenwalt [Tue, 8 Jul 2014 16:53:49 +0000 (16:53 +0000)]
Merge "Add Telefonica/Movistar specific APN details for dun"
Albert [Tue, 8 Jul 2014 04:56:08 +0000 (06:56 +0200)]
Add Telefonica/Movistar specific APN details for dun
Movistar Spain needs to add a specific APN to offer tethering
in their devices.
Change-Id: I5554ff98a5ac4c5f33b9af0083e1fac8305c9e13
Signed-off-by: Albert <alberto.crespell@gmail.com>
Stephen Hines [Tue, 8 Jul 2014 21:18:17 +0000 (21:18 +0000)]
Merge "Adds support for multi-input kernels to Frameworks/Base/RS."
Chris Wailes [Wed, 11 Jun 2014 19:01:28 +0000 (12:01 -0700)]
Adds support for multi-input kernels to Frameworks/Base/RS.
* Added a new JNI call to pass arrays of Allocations to the RS runtime.
* Added a new version of ForEach that takes an array of Allocations.
* Added some casts to disambiguate existing calls to forEach.
Change-Id: I46d2834c37075b2a2407fd8b010546818a4540d1
Brian Carlstrom [Mon, 7 Jul 2014 20:48:48 +0000 (20:48 +0000)]
Merge "Remove"
Brian Carlstrom [Tue, 17 Jun 2014 20:57:58 +0000 (13:57 -0700)]
Remove
(cherry picked from commit
9881203920c8445e9a4bdd9e4a90ba0014f34c5e)
Change-Id: Ib40823b7c03af4c71da902b0e5c504e074cf0dd9
Craig Mautner [Mon, 7 Jul 2014 17:23:06 +0000 (17:23 +0000)]
am
ef2e7667: Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists."
* commit '
ef2e76675a6c60a2a4764a2e19fdb2c4d9beb00e':
[ActivityManager] Avoid keeping restarting home when only home activity exists.
Craig Mautner [Mon, 7 Jul 2014 15:36:33 +0000 (15:36 +0000)]
am
c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again."
* commit '
c66da9d606fa3091540bc4c51c2904cc949bf777':
[ActivityManager] Prevent kill a restarted process again.
Craig Mautner [Mon, 7 Jul 2014 15:00:47 +0000 (15:00 +0000)]
am
5acdd0f6: Merge "[ActivityManager] Ensure alive process is not killedByAm."
* commit '
5acdd0f67db9b5f41a89dfb5200f37d6f5f984ec':
[ActivityManager] Ensure alive process is not killedByAm.
Narayan Kamath [Mon, 7 Jul 2014 08:57:04 +0000 (08:57 +0000)]
am
501bb0a5: Merge "Fix issue when converting fil->tl."
* commit '
501bb0a5e4a62a9e58efe2fa0a3f275c193872e7':
Fix issue when converting fil->tl.
Craig Mautner [Mon, 7 Jul 2014 15:29:50 +0000 (15:29 +0000)]
Merge "[ActivityManager] Prevent kill a restarted process again."
Nick Kralevich [Sat, 5 Jul 2014 17:16:59 +0000 (17:16 +0000)]
am
42b74e23: Merge "Typo in method name: Clone"
* commit '
42b74e231d893f553e4e8c88641e056ebcf82ac5':
Typo in method name: Clone
Nick Kralevich [Sat, 5 Jul 2014 17:11:47 +0000 (17:11 +0000)]
am
ca2df286: Merge "Fix typo in the exception message."
* commit '
ca2df28678352ea72cfb8a680796d0a908b2453b':
Fix typo in the exception message.
Nick Kralevich [Sat, 5 Jul 2014 17:11:42 +0000 (17:11 +0000)]
am
a347ece5: Merge "Fix typo in comment of FragmentTransaction"
* commit '
a347ece5a77d4b695af6255d751d98dbb519ad74':
Fix typo in comment of FragmentTransaction
Nick Kralevich [Sat, 5 Jul 2014 17:03:50 +0000 (17:03 +0000)]
am
ce259483: Merge "Added missing brace."
* commit '
ce2594832593dbf0d9d03f83054cabc9429261fa':
Added missing brace.
Nick Kralevich [Sat, 5 Jul 2014 17:03:45 +0000 (17:03 +0000)]
am
77491ac0: Merge "Correct typo in doc comment"
* commit '
77491ac00c18cd81328a3942c78a64436be65618':
Correct typo in doc comment
Nick Kralevich [Sat, 5 Jul 2014 16:59:56 +0000 (16:59 +0000)]
am
a2e4ce2b: Merge "Fix typo - issue 56671"
* commit '
a2e4ce2b7cab301f8bde5e4747be5dd85e899a63':
Fix typo - issue 56671
Nick Kralevich [Sat, 5 Jul 2014 16:59:51 +0000 (16:59 +0000)]
am
8b333467: Merge "fix trivial typo: s/meansure/measure"
* commit '
8b333467fea995d9cec72dddfcba8fa19363ee32':
fix trivial typo: s/meansure/measure
Nick Kralevich [Sat, 5 Jul 2014 16:52:11 +0000 (16:52 +0000)]
am
a6336747: Merge "Fix a copy/paste typo in ViewPropertyAnimator"
* commit '
a6336747a42fa5b64f82b7fe57ddf614d1fda9b2':
Fix a copy/paste typo in ViewPropertyAnimator
Nick Kralevich [Sat, 5 Jul 2014 16:45:36 +0000 (16:45 +0000)]
am
63af727b: Merge "Fix Issue 59989"
* commit '
63af727b4b2e05ca18f1d9f5c8b4e87a6bfd5601':
Fix Issue 59989
Nick Kralevich [Sat, 5 Jul 2014 16:45:31 +0000 (16:45 +0000)]
am
b70888d4: Merge "Fix a typo in a javadoc comment"
* commit '
b70888d45573c015fbb9d584df575bf78f5e9684':
Fix a typo in a javadoc comment
Nick Kralevich [Sat, 5 Jul 2014 16:45:26 +0000 (16:45 +0000)]
am
c9eff23b: Merge "Fix typo in DevicePolicyManager documentation"
* commit '
c9eff23b443f26fb8c4873a6ecb61eded0564163':
Fix typo in DevicePolicyManager documentation
Nick Kralevich [Sat, 5 Jul 2014 16:35:13 +0000 (16:35 +0000)]
am
3b345a6f: Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2""
* commit '
3b345a6f9103c1677a696b4770cc318df45cdcaa':
Fix javadoc typo in Message.java: "arg1" -> "arg2"
Nick Kralevich [Sat, 5 Jul 2014 16:22:17 +0000 (16:22 +0000)]
am
eb822cec: Merge "Typo fix in permission string"
* commit '
eb822cecdb128cb0a00f361b87b8378d5664a458':
Typo fix in permission string
Craig Mautner [Mon, 7 Jul 2014 21:14:33 +0000 (21:14 +0000)]
Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."
riddle_hsu [Mon, 7 Jul 2014 20:30:19 +0000 (04:30 +0800)]
[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.
Sympton:
When application crash in a special timing and system server's InputMethodManager is binding, deadlock may occur.
Root Cause:
Thread(1): When using InputMethodManager in system server, it will lock mH(handler) of InputMethodManager,
and sometimes it will call to InputMethodManagerService::showCurrentInputLocked and will call bindService at some condition,
then it will also lock ActivityManagerService.
Thread(2): When an application crashed, it will lock ActivityManager when showing crash dialog, inside the dialog,
it will call setEnabled of Button and lock mH of InputMethodManager.setEnable of TextView will lock IMM's handler.
So the deadlock happened as the flow: (2) lock AMS -> (1)lock mH -> (2)wait mH -> (1) wait AMS
Solution:
Reduce nested lock of error dialog: post message to let (2) lock mH after release AMS lock.
Change-Id: Id85c29406236db3b5fca9655fde1fcaf0afd1337
Narayan Kamath [Fri, 4 Jul 2014 08:49:02 +0000 (08:49 +0000)]
am
358a3f71: Merge "fix AudioTrack and AudioRecord JNI"
* commit '
358a3f716850e96716b766c63d50d3425a4c9ed7':
fix AudioTrack and AudioRecord JNI
Narayan Kamath [Fri, 4 Jul 2014 08:48:58 +0000 (08:48 +0000)]
am
759e0d6a: Merge "Fix LocalePicker locale filtering."
* commit '
759e0d6a7a258dbc34a38a7db320827eb9144487':
Fix LocalePicker locale filtering.
Narayan Kamath [Mon, 7 Jul 2014 08:52:10 +0000 (08:52 +0000)]
Merge "Fix issue when converting fil->tl."
Narayan Kamath [Sat, 5 Jul 2014 14:33:28 +0000 (15:33 +0100)]
Fix issue when converting fil->tl.
We should call ResourceTable::getLocales directly,
and not AssetManager::getLocales. The latter will convert
"tl" to "fil" so we'll end up thinking we have resources
for "fil" when we don't really have any.
bug:
15873165
Change-Id: I9753e4608aaecede328a40ee1f3ee6b016d0dedc
Narayan Kamath [Fri, 4 Jul 2014 08:23:08 +0000 (08:23 +0000)]
Merge "Fix LocalePicker locale filtering."
riddle_hsu [Fri, 4 Jul 2014 04:19:41 +0000 (12:19 +0800)]
[ActivityManager] Prevent kill a restarted process again.
Root Cause:
Use removeTask with flag ActivityManager.REMOVE_TASK_KILL_PROCESS will set waitingToKill = "remove task"
to the target process when its setSchedGroup is not BG_NONINTERACTIVE.
Later the target process may be killed when applying oom-adj due to setSchedGroup has changed to BG_NONINTERACTIVE.
If the process is needed to restart, the process record will be resued.
Then the restarted process may be killed again because its waitingToKill is not null.
Solution:
Clean waitingToKill when process is dead.
Change-Id: I5ffb5388127f4221da4c700d3f1c224f7ca6e7b2
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:45:04 +0000 (06:45 +0000)]
am
a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc."
* commit '
a6e9dd3f9a2d966faf2d1710d2189127b968dc52':
Fix a typo in NumberPicker javadoc.
Nick Kralevich [Sat, 5 Jul 2014 17:05:08 +0000 (17:05 +0000)]
Merge "Fix typo in comment of FragmentTransaction"
Nick Kralevich [Sat, 5 Jul 2014 17:00:02 +0000 (17:00 +0000)]
Merge "Added missing brace."
Nick Kralevich [Sat, 5 Jul 2014 16:54:56 +0000 (16:54 +0000)]
Merge "Fix typo - issue 56671"
Nick Kralevich [Sat, 5 Jul 2014 16:53:17 +0000 (16:53 +0000)]
Merge "fix trivial typo: s/meansure/measure"
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: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
Craig Mautner [Mon, 7 Jul 2014 14:56:11 +0000 (14:56 +0000)]
Merge "[ActivityManager] Ensure alive process is not killedByAm."
riddle_hsu [Fri, 4 Jul 2014 04:37:45 +0000 (12:37 +0800)]
[ActivityManager] Ensure alive process is not killedByAm.
Symptom: Unable to kill by Am again and will be skipped updating its oom adj.
Root Cause:
A restarted process will reuse original process record.
The flag killedByAm will keep previous state.
Solution:
Reset the flag killedByAm to false when the process is started.
Note: Found another similiar patch If95137d91939cc44882ad2813131bcde0edd0c1b
Change-Id: I59a86648ca8d0aed4c489d92751af120aae5ef90
Nick Kralevich [Sat, 5 Jul 2014 17:07:51 +0000 (17:07 +0000)]
Merge "Fix typo in the exception message."
Nick Kralevich [Sat, 5 Jul 2014 16:57:45 +0000 (16:57 +0000)]
Merge "Correct typo in doc comment"
Nick Kralevich [Sat, 5 Jul 2014 16:47:22 +0000 (16:47 +0000)]
Merge "Fix a copy/paste typo in ViewPropertyAnimator"
Nick Kralevich [Sat, 5 Jul 2014 16:43:58 +0000 (16:43 +0000)]
Merge "Fix Issue 59989"
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 17:11:25 +0000 (17:11 +0000)]
Merge "Typo in method name: Clone"
Nick Kralevich [Sat, 5 Jul 2014 16:30:08 +0000 (16:30 +0000)]
Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2""
Brian Duff [Thu, 3 Jul 2014 06:05:07 +0000 (06:05 +0000)]
Merge "Fix a typo in NumberPicker javadoc."
Craig Mautner [Mon, 7 Jul 2014 16:34:06 +0000 (16:34 +0000)]
Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists."
riddle_hsu [Fri, 4 Jul 2014 09:01:56 +0000 (17:01 +0800)]
[ActivityManager] Avoid keeping restarting home when only home activity exists.
Root Cause:
When there is only home activity existed,
updating home apk will call forceStopPackageLocked to finish the activity.
Then activity history becomes empty, then home will be launched,
but its package is still target to close that results a loop.
Solution:
If home activity has been force-stopped, do not stop the same home activity again.
Change-Id: Icff12028d407873c2e6f50a06bcad231b908ccbd
Narayan Kamath [Wed, 2 Jul 2014 12:12:18 +0000 (12:12 +0000)]
am
6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened."
* commit '
6e84f8c1b9c72ab6e1eb189358292237dbe1efe8':
Fix native crashes when APKs can't be opened.
Narayan Kamath [Wed, 2 Jul 2014 10:00:09 +0000 (10:00 +0000)]
am
f56399f6: Merge "Fall back to "tl" if "fil" is absent."
* commit '
f56399f6ab492c8c32b7ff9a8deeb2547f17f6da':
Fall back to "tl" if "fil" is absent.
Narayan Kamath [Wed, 2 Jul 2014 08:49:08 +0000 (08:49 +0000)]
am
104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '
104da1e495cbed81e7ebe66b80344bf916b02391':
Fix broken assumptions in LocalePicker.
Narayan Kamath [Wed, 2 Jul 2014 08:49:04 +0000 (08:49 +0000)]
am
3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
* commit '
3fa99ec77ee52164575375c7709923c94d9693a6':
Remove bogus 2 char limit for locales and countries.
Brian Carlstrom [Tue, 1 Jul 2014 22:32:01 +0000 (22:32 +0000)]
am
a6e06889: Merge "Add profiler type options"
* commit '
a6e06889fce7fbf2049f421daef02b8986736f77':
Add profiler type options
Nick Kralevich [Tue, 1 Jul 2014 21:13:12 +0000 (21:13 +0000)]
am
9b1a7d45: Merge "Allow different SELinux policies for third party apps."
* commit '
9b1a7d4570dd692cf86c385dfcdf057ad966fa57':
Allow different SELinux policies for third party apps.
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:15:28 +0000 (18:15 +0000)]
am
db816cef: Merge "Make sure we clean up"
* commit '
db816cef0dd1f1988fbcf3c70a66f9c4acf73358':
Make sure we clean up
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
Marco Nelissen [Tue, 1 Jul 2014 18:10:37 +0000 (18:10 +0000)]
Merge "Make sure we clean up"
Brian Carlstrom [Tue, 1 Jul 2014 22:25:58 +0000 (22:25 +0000)]
Merge "Add profiler type options"
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 [Tue, 1 Jul 2014 09:22:10 +0000 (09:22 +0000)]
am
1dc550fa: Merge "Fix packing of values at offset 16."
* commit '
1dc550fa7333257a130d71866be37181f8ee553b':
Fix packing of values at offset 16.
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:20:26 +0000 (00:20 +0000)]
am
7165bd6d: Merge "Add check and throw for failed Intrinsic init."
* commit '
7165bd6d7496159b426f072bdf13adfffc917a24':
Add check and throw for failed Intrinsic init.
Stephen Hines [Wed, 25 Jun 2014 20:44:09 +0000 (20:44 +0000)]
am
924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."
* commit '
924ed1fae19ba70b5c6267b977ae8c72b63fe99a':
Switch from size_t -> uint32_t for dimensions array.
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
Narayan Kamath [Tue, 24 Jun 2014 14:21:14 +0000 (14:21 +0000)]
am
71dfc7e9: Merge "Memory leak in parsePackage"
* commit '
71dfc7e9accc1ca3cda52bdf475b03fa2a334e78':
Memory leak in parsePackage
Narayan Kamath [Tue, 24 Jun 2014 12:14:12 +0000 (12:14 +0000)]
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.
Narayan Kamath [Tue, 24 Jun 2014 10:08:52 +0000 (10:08 +0000)]
am
989ab6d3: Merge "Update javadoc for android.os.Bundle."
* commit '
989ab6d38d77c0a1f7dc5e648e1950410d5d01d4':
Update javadoc for android.os.Bundle.
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
Stephen Hines [Tue, 24 Jun 2014 06:53:18 +0000 (06:53 +0000)]
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.
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 14:16:04 +0000 (14:16 +0000)]
Merge "Memory leak in parsePackage"
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 22:02:12 +0000 (22:02 +0000)]
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
Robert Greenwalt [Mon, 23 Jun 2014 21:56:52 +0000 (21:56 +0000)]
Merge "DO NOT MERGE refactor wifi p2p's startDhcpServer function"
Marco Nelissen [Mon, 23 Jun 2014 21:45:30 +0000 (21:45 +0000)]
am
0eee8ac2: Merge "Fix thumbnail bug"
* commit '
0eee8ac275927264f766bb18023365e83d4bfe5a':
Fix thumbnail bug
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>