OSDN Git Service
Kenny Root [Fri, 15 Jan 2016 23:10:02 +0000 (15:10 -0800)]
Track libcore change
This tracks libcore change I23b85308ac25fd00307d37cff1d93ee6c2bfba98
which adds SNI support.
Change-Id: I93d8a4b07cc1f599123565a5c0672dd7848f05bf
Stephen Hines [Sat, 30 Jan 2016 17:44:52 +0000 (17:44 +0000)]
Merge "Remove the CREATE_FLAG_OPT_LEVEL_0 from the Java API."
Neil Fuller [Fri, 29 Jan 2016 16:19:36 +0000 (16:19 +0000)]
Merge "Unhide @Repeatable"
Neil Fuller [Tue, 19 Jan 2016 00:34:04 +0000 (16:34 -0800)]
Unhide @Repeatable
Bug:
26623636
(cherry-picked from commit
c98d6a4c19ab9d5620c05b0f5ccb3b91a9eaba15)
Change-Id: I6378d5780def3a26d340f213973a4094e97426f5
Neil Fuller [Fri, 29 Jan 2016 16:10:13 +0000 (16:10 +0000)]
Merge "Unhide @FunctionalInterface"
Neil Fuller [Tue, 19 Jan 2016 00:20:56 +0000 (16:20 -0800)]
Unhide @FunctionalInterface
Bug:
26623636
(cherry-picked from commit
c5064327eae625b67013736048e35388decce52b)
Change-Id: I05fc731356891c4fdba79701b1b87384841d56ca
Neil Fuller [Fri, 29 Jan 2016 15:31:38 +0000 (15:31 +0000)]
Merge "Unhide Method.isDefault"
Neil Fuller [Sat, 23 Jan 2016 21:29:36 +0000 (13:29 -0800)]
Unhide Method.isDefault
Bug:
26623636
(cherry-picked from commit
20a4d572263cc288af4bd99849d1acc9e956ff06)
Change-Id: I5fd46b521d5098c72585b2acf06beaea4b9fa93f
Pavlin Radoslavov [Thu, 28 Jan 2016 00:52:41 +0000 (00:52 +0000)]
Merge "Grant CAP_WAKE_ALARM to the Bluetooth process for any user"
Pavlin Radoslavov [Thu, 28 Jan 2016 00:22:15 +0000 (16:22 -0800)]
Grant CAP_WAKE_ALARM to the Bluetooth process for any user
Use multiuser_get_app_id(uid) to check for AID_BLUETOOTH
and allow the CAP_WAKE_ALARM capability for any user.
Bug:
26784675
Change-Id: I11641e212b7c815e9137ae5620da6ad55f95a899
Miao Wang [Wed, 27 Jan 2016 21:30:00 +0000 (21:30 +0000)]
Merge "[RenderScript] Implement APIs for better multi-frame process support."
Marie Janssen [Wed, 27 Jan 2016 20:42:07 +0000 (20:42 +0000)]
Merge "IBluetooth: remove dump(), support arguments"
Przemyslaw Szczepaniak [Wed, 27 Jan 2016 15:03:39 +0000 (15:03 +0000)]
Merge "Remove java.nio.file package"
Przemyslaw Szczepaniak [Wed, 27 Jan 2016 11:14:53 +0000 (11:14 +0000)]
Remove java.nio.file package
This package has no test coverage, and we don't
know if it was ported properly. This package will
be added in future, with a test suite.
Bug:
26786186
Change-Id: I1bd7989837040da06cd914d366e9674d6b36fe86
Miao Wang [Tue, 27 Oct 2015 00:44:10 +0000 (17:44 -0700)]
[RenderScript] Implement APIs for better multi-frame process support.
Bug:
23535524
Two APIs added for multiframe processing:
- createAllocations(...): To create an array of Allocations sharing the
same Type and Usage. For USAGE_IO_INPUT Allocations, they also share
the same BufferQueue.
- getTimeStamp(): API to retrieve the time stamp associated with the
most recent buffer.
Change-Id: I6b7b35d7dca5e87ee2f3db2ee17cb9cf824bcfe1
Przemyslaw Szczepaniak [Tue, 26 Jan 2016 10:37:47 +0000 (10:37 +0000)]
Merge "Fix incorrect @hide usage in libcore"
Przemyslaw Szczepaniak [Fri, 22 Jan 2016 10:21:29 +0000 (10:21 +0000)]
Fix incorrect @hide usage in libcore
@hide annotation is only effective in Javadoc.
Bug:
26689841
Change-Id: I6e924b7452423b25d7258bb174e5b1601302c907
(cherry picked from commit
a0dda9ca9d69fdeff620c7986375589e2a4d8c42)
Miao Wang [Tue, 26 Jan 2016 01:11:41 +0000 (01:11 +0000)]
Merge "[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer"
Miao Wang [Wed, 25 Nov 2015 19:21:13 +0000 (11:21 -0800)]
[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer
Bug:
25926361
Bug:
23535524
- Construct the ByteBuffer using the AllocationGetPointer.
- Add an API to query the stride of the allocation.
- Both ByteBuffer and Stride will be cached for normal Allocations.
if using USAGE_IO, since after each ioReceive, the mallocPtr will
change, getByteBuffer will always create a new one using the most
up-to-date mallocPtr.
Change-Id: I5e84b6690e83bb062c383043275524d0e51e46eb
Dimitry Ivanov [Mon, 25 Jan 2016 18:04:18 +0000 (18:04 +0000)]
Merge "Remove path to the apk from the permittedPath"
Chad Brubaker [Mon, 25 Jan 2016 18:03:13 +0000 (18:03 +0000)]
Merge "Add getApplicationConfigForPackage"
Martijn Coenen [Mon, 25 Jan 2016 09:48:43 +0000 (09:48 +0000)]
Merge "Implementation of HCE for NFC-F."
Chad Brubaker [Sat, 23 Jan 2016 05:48:07 +0000 (21:48 -0800)]
Add getApplicationConfigForPackage
This allows services which make network connections on behalf of
applications to honor the application's network security policy.
Change-Id: I562b7bd0eb20f2f8c9f8342c211166d4e3397780
Jorim Jaggi [Sat, 23 Jan 2016 02:09:36 +0000 (02:09 +0000)]
Merge "NullPointerException when starting VoiceInteractionManagerService"
Deepanshu Gupta [Fri, 22 Jan 2016 23:53:07 +0000 (23:53 +0000)]
Merge "Remove GregorianCalendar hack"
Dimitry Ivanov [Fri, 22 Jan 2016 21:20:29 +0000 (13:20 -0800)]
Remove path to the apk from the permittedPath
Bug: http://b/
26732624
Bug: http://b/
22548808
Change-Id: Idc63550f9ab67d30aaa0a1fd1b2d19545c07d1b9
Deepanshu Gupta [Fri, 22 Jan 2016 19:11:57 +0000 (11:11 -0800)]
Remove GregorianCalendar hack
Bug: http://b.android.com/199424
Change-Id: I589d153e1f57b6302c6fe3c031c5c63e33ad9996
David Gross [Fri, 22 Jan 2016 17:00:43 +0000 (17:00 +0000)]
Merge "Add general reduction plumbing starting with Java Script::reduce()."
Yoshinobu Ito [Fri, 22 Jan 2016 09:14:18 +0000 (18:14 +0900)]
Implementation of HCE for NFC-F.
This impementation includes HCE(Host-based Card Emulation) for NFC-F
which emulates NFC Forum Type 3 Tag on a smartphone.
Signed-off-by: Daisuke Ito <DaisukeE.Ito@jp.sony.com>
Yoshinobu Ito <Yoshinobu.Ito@jp.sony.com>
Change-Id: I1618a7fba801e0705ff3cc078206a1446b3dd56d
Marie Janssen [Wed, 13 Jan 2016 00:05:15 +0000 (16:05 -0800)]
IBluetooth: remove dump(), support arguments
Because IBluetooth is a Binder service, we don't need dump() to
support dumpsys, just call the IBinder.dump().
Change-Id: Idcd48f758427b824e0b7eaafd091ba3fb2ff8993
Robert Greenwalt [Thu, 21 Jan 2016 22:10:55 +0000 (22:10 +0000)]
Merge "Add free short codes for Direct Carrier Billing and others."
John Reck [Thu, 21 Jan 2016 21:48:24 +0000 (21:48 +0000)]
Merge "libhwui: fix texture memory leak"
Sergio Giro [Thu, 21 Jan 2016 17:08:21 +0000 (17:08 +0000)]
Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser"
Sergio Giro [Thu, 21 Jan 2016 15:25:01 +0000 (15:25 +0000)]
org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser
The name DistinguishedNameParser is used by other libraries having the
same package, and some apps incorrectly include packages that are
present in the boot classpath. This relatively newly introduced
DistinguishedNameParser ends up hiding the ones in the libraries.
Bug:
26647082
Change-Id: I735aef3c1e5dd04e5a8e2eda6da6d9c9179f1c70
Dohyun Lee [Thu, 21 Jan 2016 04:46:21 +0000 (13:46 +0900)]
libhwui: fix texture memory leak
When there is not enough space and we cannot delete any
Texture in TextureCache to secure space, a new Texture is
created over and over again for the same SkBitmap and
there is the case that it is not deleted.
This patch avoids such cases.
Change-Id: Ic5353995e6d0716c31fe3bb49c60ec1a71574643
Signed-off-by: Dohyun Lee <leedhyun11@gmail.com>
Vasco Brito [Wed, 20 Jan 2016 23:39:23 +0000 (23:39 +0000)]
Add free short codes for Direct Carrier Billing and others.
Whitelist free short code batch 2016 Q1 - Android Partner
Engineering.
All short codes are used by Direct Carrier Billing on
Google Play except for the short code 83669 in "gb" which
is used by a banking application.
Change-Id: Idbc02e697c8923288beb0b88545e6cee448ad4f5
Signed-off-by: Vasco Brito <vascob@google.com>
Sanket Agarwal [Wed, 20 Jan 2016 00:23:38 +0000 (00:23 +0000)]
Merge "Add support for AVRCP 1.3."
Sanket Agarwal [Thu, 22 Oct 2015 01:23:27 +0000 (18:23 -0700)]
Add support for AVRCP 1.3.
* Add metadata support.
* Add player settings support.
* Add playback support.
A2DP Settings App support.
Bluetooth: A2DP Sink support for Settings App
- add support for A2DP Sink in Settings App. This will enable connection
initiation and updation on Settings App
- add framework Apis to support A2DP Sink. Any third party Apps can access
A2DP Sink priority of device and playing state of device
- add support for key to set priority. This manages priority of device for
A2DP Sink profile
Change-Id: If5f9139f37cdb9d200387877c7801075205c78a0
John Reck [Tue, 19 Jan 2016 18:29:30 +0000 (18:29 +0000)]
Merge "fix race condition between HWUI cache and renderThread"
Thomas Buhot [Mon, 18 Jan 2016 09:31:58 +0000 (10:31 +0100)]
fix race condition between HWUI cache and renderThread
getMaximumBitmapWidth() and getMaximumBitmapHeight() of DisplayListCanvas
need HWUI cache instance. Since the initialization of the cache is
asynchronous it may crash if not yet ready. Add a staticFence() call
to guarantee the cache has been created prior issuing the call.
Change-Id: I5ed9e5cc084444c8d1872a77fef50e294ae14e93
Signed-off-by: Thomas Buhot <thomas.buhot@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Dan Albert [Fri, 15 Jan 2016 20:41:23 +0000 (20:41 +0000)]
Merge "Make the appropriate cast to protect from mingw."
David Gross [Tue, 12 Jan 2016 20:19:15 +0000 (12:19 -0800)]
Add general reduction plumbing starting with Java Script::reduce().
Requires coordinated change in frameworks/rs.
Bug:
23535724
Change-Id: I2fee6750cf542948d8fa87a98441002c4d84f36e
Dan Albert [Fri, 15 Jan 2016 20:16:06 +0000 (12:16 -0800)]
Make the appropriate cast to protect from mingw.
As the comment at the top of the file says:
STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum
value, so a cast is necessary.
Bug: http://b/
26523949
Change-Id: I9d86cafdc47bbb9ce0e967cdde9315babc083432
Neil Fuller [Fri, 15 Jan 2016 16:27:16 +0000 (16:27 +0000)]
Merge "Add thread safety documentation"
Neil Fuller [Tue, 24 Nov 2015 18:19:06 +0000 (18:19 +0000)]
Add thread safety documentation
An upcoming change will remove "synchronized" from the API docs. This change
documents those cases where the guarantees can be determined from code
inspection.
Bug:
25767152
(cherry-picked from commit
bf0dc0fba790cf95f76870c37469703f8f20a57c)
Change-Id: I328b96328e89950b90d537bf0a6a704242de4993
Neil Fuller [Fri, 15 Jan 2016 16:22:16 +0000 (16:22 +0000)]
Merge "Fix @code escapes"
Neil Fuller [Mon, 30 Nov 2015 09:51:33 +0000 (09:51 +0000)]
Fix @code escapes
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.
Bug:
25757239
(cherry-picked from commit
71fbb81b14958b80fe55738607740c6630e4e9da)
Change-Id: I19dafddc6501be6fee362c396ac5bbdc934ae39d
Neil Fuller [Thu, 14 Jan 2016 22:20:16 +0000 (22:20 +0000)]
Merge "Hide static setDefault methods in ICU4J"
Robert Greenwalt [Wed, 13 Jan 2016 20:35:34 +0000 (20:35 +0000)]
Merge "Add free short codes for Direct Carrier Billing in Google Play"
Samuel Tan [Tue, 12 Jan 2016 23:09:52 +0000 (23:09 +0000)]
Merge "Remove PersistableBundle.aidl from Java framework"
Samuel Tan [Wed, 6 Jan 2016 01:29:43 +0000 (17:29 -0800)]
Remove PersistableBundle.aidl from Java framework
Remove PersistableBundle.aidl from the Java framework, since it
has been moved to the native libbinder.
BUG:
26292234
Change-Id: Ia3dc49a3ad92f4c579e6dff0606c1db8fb3be76b
TEST: aosp_arm builds successfully.
Michael Wright [Tue, 12 Jan 2016 22:20:52 +0000 (22:20 +0000)]
Merge "Make sure NaturalSurfaceLayout is consistent with SurfaceControl"
Michael Wright [Tue, 12 Jan 2016 21:46:38 +0000 (21:46 +0000)]
Merge "Animate backlight quickly when display state request to change or power mode changed"
Kenny Root [Tue, 12 Jan 2016 20:59:32 +0000 (20:59 +0000)]
Merge "Track changes in libcore"
Kenny Root [Tue, 12 Jan 2016 20:58:04 +0000 (12:58 -0800)]
Track changes in libcore
The OCSP update added some API changes necessary to interact with it.
This change tracks the addition of the API.
Change-Id: I22c0448848747943bc039ff8e8fd0a1f0c531224
Edward Savage-Jones [Tue, 15 Dec 2015 18:20:51 +0000 (19:20 +0100)]
NullPointerException when starting VoiceInteractionManagerService
If an end user disables the package that implements support for
Voice Assist (Google App) and reboots, an NPE is thrown during boot,
which results in the device getting stuck at the boot animation.
Recovery is not possible without USB debugging enabled, leaving factory
reset/user data wipe as the only other option.
Change-Id: I9c161fff7f096deee13bf8e37d951e20898ae3ff
mochangming [Tue, 29 Dec 2015 05:55:24 +0000 (13:55 +0800)]
Animate backlight quickly when display state request to change or power mode changed
* mAppliedDimming should be false when power request policy is not dim.
* mAppliedLowPower should be false when low power mode is disabled.
* Backlight brightness changes quickly.
Change-Id: I44bf9c216554f8dce5abd0520f198824df5e8dcf
Signed-off-by: mochangming <mochangming@xiaomi.com>
Todd Kennedy [Fri, 8 Jan 2016 18:03:15 +0000 (18:03 +0000)]
Merge "Update PackageInstaller install handing"
Andreas Gampe [Fri, 8 Jan 2016 17:35:45 +0000 (17:35 +0000)]
Merge "Frameworks/base: New preload tool"
Andreas Gampe [Tue, 15 Sep 2015 15:57:12 +0000 (08:57 -0700)]
Frameworks/base: New preload tool
Add a new preload tool based on hprof dumps. This means that only
a userdebug build (to adjust the pre-existing preloaded-classes
file) is required now, not a recompiled runtime.
Change-Id: Ib0c00de3b248e49fa8271cbace67c5d4a50170a1
Narayan Kamath [Fri, 8 Jan 2016 09:36:14 +0000 (09:36 +0000)]
Merge "Trivial correction of Camera2 API description"
Narayan Kamath [Fri, 8 Jan 2016 09:30:41 +0000 (09:30 +0000)]
Merge "Fixed calendar fields comparison"
Philipp Hasper [Thu, 25 Jun 2015 10:10:01 +0000 (12:10 +0200)]
Fixed calendar fields comparison
Month was compared with the day and vice versa.
Found by dukejeffrie.
Change-Id: Ic4efca440c408325819ff1df85db7b407cf3207e
Hidenari Koshimae [Fri, 8 Jan 2016 07:18:28 +0000 (16:18 +0900)]
Trivial correction of Camera2 API description
Change-Id: Ibb3393b94812dfe7b496182bb5ef43f1a5df7434
Stephen Hines [Thu, 7 Jan 2016 21:57:21 +0000 (21:57 +0000)]
Merge "Remove graphics-related RenderScript tests."
Todd Kennedy [Tue, 29 Sep 2015 22:43:00 +0000 (15:43 -0700)]
Update PackageInstaller install handing
* Allow forcing permission check. We want to modify the PackageInstaller to
use the PackageInstallerSession for better security / remove deprecated APIs.
In order to do this and continue to prompt for permissions, we need to prevent
the PakcageInstaller from auto-approving the permissions.
* Add originating UID to SessionParams. This is used for package verifier
checks.
Bug:
22282121
Change-Id: I19079749d20ace66f1332f399d52cb0fb8784cd9
Alex Klyubin [Thu, 7 Jan 2016 19:08:26 +0000 (19:08 +0000)]
Merge "[1/3] Remove unnecessary throws statement in ServiceManager"
Calin Juravle [Thu, 7 Jan 2016 11:44:55 +0000 (11:44 +0000)]
Merge "Create jit profile file during the app startup flow."
Calin Juravle [Thu, 17 Dec 2015 15:06:49 +0000 (17:06 +0200)]
Create jit profile file during the app startup flow.
ActivityThread has already all the needed information
(userId,sharedAppId) to create the profile file and set the correct
permissions on it. This avoids passing uids to the runtime which now
expects the profile file to be already created.
As part of this change:
- move the registration with the runtim in handleBindApplication
- register only if needed: we could properly setup a profile file and we
have at least one code path. Note that registration with the runtime is
done solely for profiling reasons.
Bug:
26080105
Change-Id: I72657e9ea0a0449a09734456b5f8b5da844cee62
Umair Khan [Wed, 6 Jan 2016 14:17:20 +0000 (19:47 +0530)]
[1/3] Remove unnecessary throws statement in ServiceManager
The exception is already caught by the try-catch block.
Change-Id: I0c10fe51d12a10cbc02a25c719d03a4ba6497767
Signed-off-by: Umair Khan <omerjerk@gmail.com>
Wale Ogunwale [Wed, 6 Jan 2016 15:47:05 +0000 (15:47 +0000)]
Merge "[WindowManagerService] fix starting window issue"
Chad Brubaker [Mon, 4 Jan 2016 20:26:56 +0000 (20:26 +0000)]
Merge "Add ConfigNetworkSecurityPolicy"
Dan Sandler [Mon, 4 Jan 2016 19:58:42 +0000 (19:58 +0000)]
Merge "Use GregorianCalendar.add() when searching for next alarm."
Ronnie Leng [Mon, 4 Jan 2016 17:36:08 +0000 (11:36 -0600)]
[WindowManagerService] fix starting window issue
Symptom:
1. Acitivity A and B belong to same task.
2. A is started and start B in its code
3. B is opened with blank screen
If starting icon has been display, both startingWindow and
startingView should not be null.
Current logic only uses judgement on startWindow. In above
case, it leads startingView set to null as A and B shares
the same starting window due to same task. Then system will
not get chance to remove startingView as it is null.
It needs add judgement on startingView.
Change-Id: I6cfa1a3ebce93ce435cc2d9ada239b1e808988de
Dan Sandler [Tue, 29 Dec 2015 20:45:39 +0000 (15:45 -0500)]
Use GregorianCalendar.add() when searching for next alarm.
Never attribute to malice that which is adequately explained
by a bug, particularly one involving date math.
Bug:
26326394
Change-Id: I3483ac102c678a8852565c8ea94c06e19b3f26d8
Pavlin Radoslavov [Tue, 29 Dec 2015 01:24:14 +0000 (01:24 +0000)]
Merge "Use GID "wakelock" to control access to kernel wakelock"
Pavlin Radoslavov [Tue, 24 Nov 2015 01:13:25 +0000 (17:13 -0800)]
Use GID "wakelock" to control access to kernel wakelock
* Added GID "wakelock" (3010) to the list of groups the System Server
belongs to.
* Added GID "wakelock" to the list of assigned groups for the
"android.permission.BLUETOOTH_STACK" Android permission.
* Grant CAP_BLOCK_SUSPEND to processes that belong to GID "wakelock"
Bug:
25864142
Change-Id: I8a9a5f11e4a9ecd1abf2d4f4b90ec89b3101332e
yang.xa.liu [Fri, 18 Dec 2015 08:40:31 +0000 (16:40 +0800)]
Make sure NaturalSurfaceLayout is consistent with SurfaceControl
SurfaceControl and NaturalSurfaceLayout will be created in screen-off
mode. Screen-on animation also creates NaturalSurfaceLayout. And
NaturalSurfaceLayout uses the reference of SurfaceControl.
SurfaceControl points to NULL when screen-on process calls destory
function, which will not be called in screen-off process. It makes
NaturalSurfaceLayout's member points to the SurfaceControl with NULL.
Crash occurs by accessing the destroyed SurfaceControl.
This CL makes the creation of SurfaceControl and NaturalSurfaceLayout
to one-to-one.
Change-Id: Ic47ea73dea67d2aba4e3e0766d1353198d7dff1d
Narayan Kamath [Thu, 24 Dec 2015 11:56:44 +0000 (11:56 +0000)]
Merge changes from topic 'aosp-merge-24-12'
* changes:
Special case system_server to not create the JIT code cache.
Don't use IntegralToString
Track libcore commit
85d69e16fe1e59e50c1ad228e754abf325088362.
Track API changes to java.lang.ref.Reference.
Remove merge markers from preloaded-classes
Move StrictJarFile from libcore to framework
Switch RecoverySystem impl to use sun.security.pkcs
API update for OpenJdk based libcore
Use libcore/known_oj_tags for the javadoc stage.
Stop preloading fortress classes
Use HexDump instead of java.lang.IntegralToString
Add core-oj to the list of core library jars.
Nicolas Geoffray [Fri, 11 Dec 2015 15:01:04 +0000 (15:01 +0000)]
Special case system_server to not create the JIT code cache.
(cherry picked from commit
3c43b3863328e339dff90b216aed15194d129e4a)
Change-Id: Ic7b0887f9edcb950fad98ccbe66cab6949fbdc52
Chad Brubaker [Tue, 1 Dec 2015 21:03:27 +0000 (13:03 -0800)]
Don't use IntegralToString
Fix master build
(cherry picked from commit
7845e44c0cff3ec6a9ea0e5059fa1f7019ef0eb7)
Change-Id: Ic99a5e868b5d42e7bf72ef5388e30f070b6655d8
Narayan Kamath [Sun, 20 Dec 2015 20:17:40 +0000 (20:17 +0000)]
Track libcore commit
85d69e16fe1e59e50c1ad228e754abf325088362.
Unhide Pattern.UNICODE_CHARACTER_CLASS.
(cherry picked from commit
c55d9e767a2ddaced89f4528ce0fce4f2f89357e)
Change-Id: I5c53d8db13948c5d143c05694f49872456c260eb
Narayan Kamath [Wed, 9 Dec 2015 15:59:03 +0000 (15:59 +0000)]
Track API changes to java.lang.ref.Reference.
(cherry picked from commit
12f62b7ec1e0d119541ab8febd337012248d2eb7)
Change-Id: I7a08d9de7cf39e4c3e11aa504e5e48a7edf17333
Przemyslaw Szczepaniak [Wed, 2 Dec 2015 11:32:22 +0000 (11:32 +0000)]
Remove merge markers from preloaded-classes
(cherry picked from commit
b0868054720a05d9e6d8ef6ee7e4c8c2d176f456)
Change-Id: Ieb1953e33dab7f852740872af110a938eb5c1ca4
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