OSDN Git Service
Kenny Root [Fri, 23 Oct 2015 23:32:01 +0000 (23:32 +0000)]
Merge "Add Workman keyboard layout"
Miao Wang [Fri, 23 Oct 2015 17:00:31 +0000 (17:00 +0000)]
Merge "[RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements."
Andreas Gampe [Fri, 23 Oct 2015 03:46:40 +0000 (03:46 +0000)]
Merge "Revert "libs: add libpackagelistparser""
Andreas Gampe [Fri, 23 Oct 2015 02:49:29 +0000 (19:49 -0700)]
Revert "libs: add libpackagelistparser"
This reverts commit
dc06bb0752c1bc3e87b04a097b308bca1bc86181.
This should go into system/core.
Change-Id: Idf304ac5ccd4bcc86722f65688e3ee6284452287
Daniel Cashman [Thu, 22 Oct 2015 23:03:51 +0000 (23:03 +0000)]
Merge "libs: add libpackagelistparser"
Tao Bao [Wed, 21 Oct 2015 17:30:04 +0000 (17:30 +0000)]
Merge "Clean up the uncrypted OTA package on bootup."
Wale Ogunwale [Wed, 21 Oct 2015 16:03:23 +0000 (16:03 +0000)]
Merge "Ensure state transition of paused activity."
Elliott Hughes [Tue, 20 Oct 2015 20:25:50 +0000 (20:25 +0000)]
Merge "Fix lseek argument order."
Elliott Hughes [Tue, 20 Oct 2015 20:23:18 +0000 (13:23 -0700)]
Fix lseek argument order.
Change-Id: Ibc2f98e4c26d0ac6ac7b4a73775c5213c4df4518
riddle_hsu [Tue, 20 Oct 2015 08:34:05 +0000 (16:34 +0800)]
Ensure state transition of paused activity.
If there are 2 activties launched during screen off.
Both of them will be scheduled to pause immediately.
But if the first one does not complete pause in time,
and the second one is a non-fullscreen activity, the
first one will still be visible and no need to stop.
After the second one complete pause, mPausingActivity
is cleared, then the first one's complete pause is failed
and keep state at pausing. If it calls finish, it cannot
be destroyed because its state is pausing so expect it will
be paused later, but actually is has complete paused.
Sample and video:
https://code.google.com/p/android/issues/detail?id=190955
Solution:
A failed-to-pause activity should still change state to paused
if it is pausing. Then when the first activity calls finish,
it will satisfy the condition in ActivityStack.finishActivityLocked
"r.state != ActivityState.PAUSING" to continue the finish flow.
Change-Id: I2f211ddf5039b332b0c7d01ccd043aa18fe168f7
Mathieu Chartier [Mon, 19 Oct 2015 22:36:40 +0000 (22:36 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space"
Mathieu Chartier [Mon, 19 Oct 2015 20:48:34 +0000 (13:48 -0700)]
Fix read_mapinfo to recognize free list large object space
Bug:
25081604
Change-Id: Ie277fd964afcdc80b97432cbd611a8136a2059d7
Tao Bao [Mon, 19 Oct 2015 21:48:36 +0000 (14:48 -0700)]
Clean up the uncrypted OTA package on bootup.
An OTA package needs to be uncrypted before rebooting into recovery if
it sits on an encrypted /data partition. Once uncrypt gets started, we
cannot re-run it on the package again. Because the file may have been
fully or particially uncrypted and we may end up with a corrupt file
under recovery. Always clean up the package when the device boots into
the normal system to avoid that.
Bug:
24973532
Change-Id: I91682c103d1f2b603626c4bf8d818bced71e3674
Wale Ogunwale [Fri, 16 Oct 2015 13:50:35 +0000 (13:50 +0000)]
Merge "Disassociate system windows from apps"
tiger_huang [Tue, 13 Oct 2015 13:38:19 +0000 (21:38 +0800)]
Disassociate system windows from apps
With the original logic, if an app creates a system window, when the
user goes to home screen, the system window will be still there and
become unable to receive input events, because the system window will
be also changed to the stopped state with the app window, and the
current logic of ViewRootImpl forbid a stopped window receiving input
events.
This change prevents assigning the token of the app window to system
windows created by the app, so that when the app goes to the stopped
state, its system windows won't be affected (can still receive input
events).
This change is related to the following changes:
https://android.googlesource.com/platform/frameworks/base/+/
a5d29971f8f4d463348e9de0f7af7e2e92a377a0
https://android.googlesource.com/platform/frameworks/base/+/
15ed2754a308546a54ab1061b4e365d6fe9b898d
https://android.googlesource.com/platform/frameworks/base/+/
c3672cd3f7e2bd87d6de9dada499de82b62fae84
https://android.googlesource.com/platform/frameworks/base/+/
41725dedc33906aaafee36b2d6523596e2a8a52e
Bug:
https://code.google.com/p/android/issues/detail?id=189710
Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c
Brian Carlstrom [Thu, 15 Oct 2015 15:55:45 +0000 (15:55 +0000)]
Merge "Add support for --user to "pm path" for work profile use"
William Roberts [Fri, 24 Jul 2015 17:05:06 +0000 (10:05 -0700)]
libs: add libpackagelistparser
There are 4 components that all implement package parsing, they are:
1. sdcardd
2. libselinux
3. logd
4. runas
Create a library that can be used by all of them, and new ones as needed.
Change-Id: I87a406802f95d8e7bfd8ee85f723f80e9e6b6c0c
Signed-off-by: William Roberts <william.c.roberts@intel.com>
Jeffrey Vander Stoep [Wed, 14 Oct 2015 21:33:59 +0000 (21:33 +0000)]
Merge "Pass privapp specifier for selinux labeling"
Miao Wang [Tue, 13 Oct 2015 00:24:13 +0000 (17:24 -0700)]
[RenderScript] Add null check for return values of JNI
Get<TYPE>ArrayElements.
Bug:
20760800
Change-Id: I6ba56933a71721da88d31dbf74c48d42a924305a
Adam Lesinski [Mon, 12 Oct 2015 19:30:23 +0000 (19:30 +0000)]
Merge "RRO: idmap: allow flock(2) to block"
Adam Lesinski [Mon, 12 Oct 2015 19:29:39 +0000 (19:29 +0000)]
Merge "RRO: idmap: fix sorting of overlays.list"
Adam Lesinski [Mon, 12 Oct 2015 19:29:14 +0000 (19:29 +0000)]
Merge "Handle 'root' pseudo-package in the appops command"
Adam Lesinski [Mon, 12 Oct 2015 18:53:25 +0000 (18:53 +0000)]
Merge "Make 'idmap --scan' accept more than one input directory"
Jeff Vander Stoep [Mon, 12 Oct 2015 15:28:56 +0000 (08:28 -0700)]
Pass privapp specifier for selinux labeling
Allow privileged apps to run in their own priv_app domain.
Motivation:
Untrusted_app is overprivileged due to the inclusion of privileged
apps like gmscore, play store and finsky. Moving these and other
privileged apps to their own domain reduces the permissions required
by untrusted_app.
A separate priv_app domain also protects priv-apps by further
isolating them from third party apps.
Bug:
22033466
Change-Id: I8e6ae5677c5a978301c453d0aa51ebed4459f5a0
Wale Ogunwale [Mon, 12 Oct 2015 14:39:16 +0000 (14:39 +0000)]
Merge "Fix resumeHomeStackTask can't resume home if activity is finishing."
Mark Lu [Thu, 8 Oct 2015 05:31:01 +0000 (13:31 +0800)]
Fix resumeHomeStackTask can't resume home if activity is finishing.
Not to resume home activity in finishing stage as following case:
When only home task has 2 activities,
(ex: SetupWizard & DeviceOwnerProvisioningActivity),
If SetupWizard crashed during DeviceOwnerProvisioningActivity in
finishing stage,
makes DeviceOwnerProvisioningActivity cannot destroy immediately,
In resumeHomeStackTask, will resume DeviceOwnerProvisioningActivity
(returned by getHomeActivity),
But actually, DeviceOwnerProvisioningActivity cannot be resumed.
Caused ANR when back key since no more running activity can resume.
Change-Id: Icec49e092d2e7bee7f6a2d198913c1c5db7122f2
Pirama Arumuga Nainar [Fri, 9 Oct 2015 16:57:54 +0000 (16:57 +0000)]
Merge "Fix punctuation and typos in AllocationAdapter's documentation."
Filip Gruszczynski [Thu, 8 Oct 2015 23:50:17 +0000 (23:50 +0000)]
Merge "Make accessing mInputMethodTarget thread-safe"
Pirama Arumuga Nainar [Thu, 8 Oct 2015 02:59:48 +0000 (19:59 -0700)]
Fix punctuation and typos in AllocationAdapter's documentation.
Change-Id: I5574ff201b857a29f30ebe8413dbe4128dcff3ae
Snild Dolkow [Thu, 3 Sep 2015 09:50:05 +0000 (11:50 +0200)]
Handle 'root' pseudo-package in the appops command
The AppOpsService handles the 'root' pseudo-package as any other; it
gets no automatic allowances. This is reasonable, but it blocked me from
accessing the mms-sms provider through the 'content' command, even in a
root shell.
So I tried to change the rules:
$ adb root
$ adb shell appops set root WRITE_SMS allow
Error: No UID for root in user 0
This error occurs in the appops command because there isn't really a
package called root, so the UID lookup via PackageManager fails.
But we know that root is UID 0, so we can just skip the lookup.
(Also, AppOpsService handles the other way around in getOpsLocked method.)
Change-Id: Ie0cad67efa438a74a4d9921d29933610cfb13974
Mårten Kongstad [Wed, 18 Mar 2015 14:24:18 +0000 (15:24 +0100)]
RRO: idmap: fix sorting of overlays.list
Multiple overlay packages with targetPackage="android" are loaded in the
wrong order due to the incorrect order they are listed in overlays.list.
This will cause runtime resource overlay to fail when multiple overlay
packages target the same resources in framework-res.apk.
Correct the order in which overlays are loaded by changing the sorting
of overlays.list.
Background: commit
f90f2f8d changed the order in which overlay packages
should be added to ResTables. The expected order is now in ascending
priority. This must be reflected in overlays.list.
Change-Id: I249984c0e34b6009e7280ce2777750c76ab16e37
Mårten Kongstad [Fri, 20 Mar 2015 11:57:36 +0000 (12:57 +0100)]
Make 'idmap --scan' accept more than one input directory
The 'idmap --scan' command was limited to only scan a single directory
for overlay packages. Update idmap to support any number of directories.
Change-Id: I851f5720a3c1d844235911a0833670652a20a3c8
Mårten Kongstad [Wed, 18 Mar 2015 14:18:10 +0000 (15:18 +0100)]
RRO: idmap: allow flock(2) to block
During creation of an idmap an advisory lock is applied on the
output file using flock(2). This commit removes the LOCK_NB flag
from the call to flock(2).
The reason for this is that if the function were to return
EWOULDBLOCK, the entire idmap operation would be aborted leading
to the device booting without the correct overlay packages applied.
Change-Id: Iad319779976e950d4354e4f60b30439f6f208b77
Alan Viverette [Wed, 7 Oct 2015 16:38:02 +0000 (16:38 +0000)]
Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup"
Alan Viverette [Wed, 7 Oct 2015 16:36:58 +0000 (16:36 +0000)]
Merge "Reset the setOnKeyListener callback when view is destroyed"
Alan Viverette [Wed, 7 Oct 2015 16:30:36 +0000 (16:30 +0000)]
Merge "Text size for empty view shall be styled according to theme"
Alan Viverette [Wed, 7 Oct 2015 16:27:26 +0000 (16:27 +0000)]
Merge "Remove hard-coded DrawSelectorOnTop on ListFragment's default ListView."
Alan Viverette [Wed, 7 Oct 2015 16:23:36 +0000 (16:23 +0000)]
Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams"
Alan Viverette [Wed, 7 Oct 2015 16:22:36 +0000 (16:22 +0000)]
Merge "To call TypedArray.recycle() when we are done with the array."
Kenny Root [Tue, 6 Oct 2015 00:19:33 +0000 (17:19 -0700)]
Add Workman keyboard layout
Change-Id: I57574a11969f65c48900fabff218d3af4717dc9c
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:33:38 +0000 (23:33 +0000)]
am
46b51097: Merge "Safely handle interrupts during Thread.join()"
* commit '
46b51097b92900866ac5b25762f622d3ceb1be5d':
Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:27:10 +0000 (23:27 +0000)]
Merge "Safely handle interrupts during Thread.join()"
Pirama Arumuga Nainar [Fri, 2 Oct 2015 23:38:08 +0000 (16:38 -0700)]
Safely handle interrupts during Thread.join()
Interrupt current thread if InterruptedException is received during
Thread.join(). Also, log the interruption.
Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
Stephen Hines [Sat, 3 Oct 2015 00:34:05 +0000 (17:34 -0700)]
resolved conflicts for
bd57dac5 to stage-aosp-master
Change-Id: I5107af13712d7cc908d8699e5c15a002f0a3ec85
Chris Craik [Fri, 2 Oct 2015 22:30:09 +0000 (22:30 +0000)]
Merge "Don't unregister Fonts from renderer at destruction"
Pirama Arumuga Nainar [Fri, 2 Oct 2015 22:08:11 +0000 (22:08 +0000)]
am
ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"
* commit '
ca3e5aeaa65ae1d77ce92f082ab789933eb18237':
Retry if interrupted before mMessageThread has joined
Pirama Arumuga Nainar [Fri, 2 Oct 2015 21:58:50 +0000 (21:58 +0000)]
Merge "Retry if interrupted before mMessageThread has joined"
Pirama Arumuga Nainar [Fri, 2 Oct 2015 19:06:10 +0000 (12:06 -0700)]
Retry if interrupted before mMessageThread has joined
Bug:
24342101
If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing. Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.
Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
Chris Craik [Fri, 2 Oct 2015 21:19:39 +0000 (14:19 -0700)]
Don't unregister Fonts from renderer at destruction
bug:
24584749
Fonts are only destroyed when the renderer is destroyed, this prevents
modifying the FontRenderer's LruCache while it's being iterated through
in FontRenderer::~FontRenderer.
Change-Id: I0e2c9f87981bfa50454ec8689df05851839e288e
Sergio Giro [Thu, 1 Oct 2015 10:16:44 +0000 (10:16 +0000)]
am
86e67d70: Merge "frameworks/base: delete TinyHashMap"
* commit '
86e67d708d738807c843850a3b6c9170e514ff8f':
frameworks/base: delete TinyHashMap
Sergio Giro [Thu, 1 Oct 2015 10:10:10 +0000 (10:10 +0000)]
Merge "frameworks/base: delete TinyHashMap"
tiger_huang [Thu, 1 Oct 2015 06:11:27 +0000 (14:11 +0800)]
Make accessing mInputMethodTarget thread-safe
Use the lock to prevent other threads clearing mInputMethodTarget
while we are accessing members of mInputMethodTarget, or it will
cause system server crash due to unexpected NullPointerException.
Change-Id: Iec3bed916a019827364ddaf63a89270a4c407a47
Miao Wang [Wed, 30 Sep 2015 23:44:22 +0000 (23:44 +0000)]
am
134c504a: Merge "[RenderScript] pass correct length of ains to BLAS functions"
* commit '
134c504a3ea687a0ea875057792e66705ddbfce7':
[RenderScript] pass correct length of ains to BLAS functions
Miao Wang [Wed, 30 Sep 2015 22:53:18 +0000 (22:53 +0000)]
Merge "[RenderScript] pass correct length of ains to BLAS functions"
Miao Wang [Wed, 30 Sep 2015 22:38:07 +0000 (15:38 -0700)]
[RenderScript] pass correct length of ains to BLAS functions
bug:
24540091
Change-Id: Ia541bcbee07125c4caf3e0f4863702a3c0b929d5
Daniel Erat [Wed, 30 Sep 2015 21:30:31 +0000 (21:30 +0000)]
am
c3f37589: Merge "Update instructions in IPowerManager.aidl."
* commit '
c3f37589e04a52c109c63f6411db444500d4f92c':
Update instructions in IPowerManager.aidl.
Daniel Erat [Wed, 30 Sep 2015 21:21:33 +0000 (21:21 +0000)]
Merge "Update instructions in IPowerManager.aidl."
Daniel Erat [Wed, 30 Sep 2015 20:55:35 +0000 (14:55 -0600)]
Update instructions in IPowerManager.aidl.
Clarify IPowerManager.aidl's instructions for keeping the
C++ implementation in sync.
Change-Id: Ic51a3844483031e71fe2cfa1d3e8a065df86d119
Sene Gales [Wed, 30 Sep 2015 13:41:29 +0000 (14:41 +0100)]
frameworks/base: delete TinyHashMap
In DeferredDisplayList use std::unordered_map instead of TinyHashMap
Towards deprecation of BasicHashTable
Change-Id: I91b8d5dc80444c88fecff9c362fa610cca253973
Neil Fuller [Wed, 30 Sep 2015 13:54:53 +0000 (13:54 +0000)]
am
ead371de: Merge "Remove use of \'_\' variable name"
* commit '
ead371ded06fcf14b7af86a92100b0c3c92fd320':
Remove use of '_' variable name
Neil Fuller [Wed, 30 Sep 2015 13:48:16 +0000 (13:48 +0000)]
Merge "Remove use of '_' variable name"
Baligh Uddin [Tue, 29 Sep 2015 14:47:24 +0000 (14:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:47:22 +0000 (14:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:40:57 +0000 (14:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:40:41 +0000 (14:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:40:29 +0000 (14:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:39:29 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:39:25 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:39:23 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:39:20 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:39:16 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:38:48 +0000 (14:38 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:38:16 +0000 (14:38 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Neil Fuller [Tue, 29 Sep 2015 14:22:40 +0000 (15:22 +0100)]
Remove use of '_' variable name
'_' may become invalid in future versions of the Java language
and generates warnings in OpenJDK 8.
Bug:
24494019
Change-Id: Id77c8f003b0fdf295191d2d8dbd5b0b0edde2b44
Baligh Uddin [Tue, 29 Sep 2015 14:16:23 +0000 (14:16 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 10:13:09 +0000 (03:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I183c668c3c25901599a969206c5b8e0026ae3d4c
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 10:09:05 +0000 (03:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I46139a756e32aa01a2e2a1e707d313a309dc7ed0
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:57:43 +0000 (01:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I26c007f30d5540638e8519f09051088d55b7dcd7
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:55:45 +0000 (01:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b78a94809c16f73faaf44c1998e08165ff2014e
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:46:59 +0000 (01:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibc1f9d45ae3e029f0a2e7801f1c754c0d81a911b
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:45:05 +0000 (01:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I99d39e62622079d2e0dcfd2b739aded1ef286352
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:42:59 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3486557152d39d80058d08ce50ae4eb09764a009
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:37:52 +0000 (01:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2cdd44b0019090f2f4dbe355901e8ad8ffef626e
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:35:38 +0000 (01:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia575dec5643f0e64e9c95ac8a9e9d0ef717b6c46
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:33:36 +0000 (01:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I55491102910a9032fe4bfaec05916a2e627c7b86
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:31:39 +0000 (01:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4792c6e15e22c63197f7c73ea05db41ce896f561
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:29:36 +0000 (01:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I72e15159d79d575b98af928b6d79b5ecd2cf03d1
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:27:34 +0000 (01:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7de2baf9bc397126186b682cd5893629d4a8a33b
Auto-generated-cl: translation import
Dan Willemsen [Mon, 28 Sep 2015 21:23:57 +0000 (21:23 +0000)]
am
899110f3: Merge "Add exported include dir for libandroid_runtime"
* commit '
899110f3012eb9ab2056d8ee182d5bdab0ecae19':
Add exported include dir for libandroid_runtime
Dan Willemsen [Mon, 28 Sep 2015 21:14:42 +0000 (21:14 +0000)]
Merge "Add exported include dir for libandroid_runtime"
Dimitry Ivanov [Mon, 28 Sep 2015 18:23:56 +0000 (18:23 +0000)]
am
66f5affb: Merge "Fix bug number for linker related workarounds"
* commit '
66f5affbe41a49bedf35e73b7c7f482db6e2fa7b':
Fix bug number for linker related workarounds
Todd Kennedy [Mon, 28 Sep 2015 18:20:38 +0000 (11:20 -0700)]
resolved conflicts for
4ed21bf0 to stage-aosp-master
Change-Id: I9c8ab83589ee3786c884f34066c1f3d709dc5136
Dimitry Ivanov [Mon, 28 Sep 2015 18:07:40 +0000 (18:07 +0000)]
Merge "Fix bug number for linker related workarounds"
Todd Kennedy [Mon, 28 Sep 2015 17:47:01 +0000 (17:47 +0000)]
Merge "Allow using the JIT"
Dmitriy Ivanov [Mon, 28 Sep 2015 17:37:49 +0000 (10:37 -0700)]
Fix bug number for linker related workarounds
Bug: http:/b/
24425865
Change-Id: Iba52acc99c8ff548ff875726988600ed230c988e
Todd Kennedy [Fri, 25 Sep 2015 21:47:15 +0000 (14:47 -0700)]
Allow using the JIT
Instead of the JIT only being available for eng builds [or configurable
via environment variable], allow the JIT to be enabled programatically.
Change-Id: Ifcbc8445fb8bd45ce2bfed3f80fbaf48496f8e3a
Todd Kennedy [Fri, 25 Sep 2015 22:06:49 +0000 (15:06 -0700)]
resolved conflicts for
7de7e0b0 to stage-aosp-master
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
Todd Kennedy [Fri, 25 Sep 2015 21:41:39 +0000 (21:41 +0000)]
Merge "Pass dexopt flags as integer"
Dan Willemsen [Fri, 25 Sep 2015 03:45:35 +0000 (20:45 -0700)]
Add exported include dir for libandroid_runtime
The libnativehelper global include dir is being removed.
Bug:
18903857
Change-Id: I6f1bed76372ccedbe7feb4d215ba8c1c0fc0a87f
Todd Kennedy [Fri, 25 Sep 2015 14:46:12 +0000 (07:46 -0700)]
Pass dexopt flags as integer
Instead of using a series of booleans, create a single flags integer
that contains all of the dexopt options.
Change-Id: Ia8fa968f64b164267f43dd29cea9dc0413058125
OSDN Git Service
