OSDN Git Service
Nick Kralevich [Wed, 12 Aug 2015 23:46:28 +0000 (23:46 +0000)]
Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin."
Elliott Hughes [Wed, 12 Aug 2015 22:21:46 +0000 (22:21 +0000)]
Merge "Lose HAVE_ANDROID_OS from frameworks/base."
Elliott Hughes [Wed, 12 Aug 2015 21:49:53 +0000 (14:49 -0700)]
Lose HAVE_ANDROID_OS from frameworks/base.
Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e
Neil Fuller [Fri, 7 Aug 2015 14:46:06 +0000 (14:46 +0000)]
Merge "Add ICU as a java library for docs."
Yusuke Sato [Wed, 5 Aug 2015 22:15:50 +0000 (22:15 +0000)]
Merge "Clean up AssetManager::scanAndMergeZipLocked"
Yusuke Sato [Wed, 5 Aug 2015 17:46:18 +0000 (17:46 +0000)]
Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
Stephen Smalley [Wed, 5 Aug 2015 17:40:49 +0000 (13:40 -0400)]
SELinuxPolicyInstallReceiver: Switch to file_contexts.bin.
Switch to file_contexts.bin.
Change-Id: I745a98c324075b42d8f20cf6cf36568896476f3e
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
John Reck [Tue, 4 Aug 2015 20:52:40 +0000 (20:52 +0000)]
Merge "animateNoDamage failed to remove from current frame list"
John Reck [Tue, 4 Aug 2015 19:55:53 +0000 (19:55 +0000)]
Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0"
Matthew Williams [Tue, 4 Aug 2015 17:39:51 +0000 (17:39 +0000)]
Merge "Fix NPE in JobStore when jobs.xml is empty."
Ye Ouyang [Tue, 4 Aug 2015 15:40:57 +0000 (10:40 -0500)]
animateNoDamage failed to remove from current frame list
runRemainingAnimations is used to animate the available animation handle
which were not yet run, it actually animate those animation handle and
removes from the list by notifyAnimationsRan(). In case if these animation
handles are not removed, it leads to the Fatal Assert of runRemainingAnimations.
Some usecases causes the addition of animation handle when there is
no animators, in these cases this check prevents execution of
notifyAnimationsRan() leads to Fatal Assert crash of runRemainingAnimations.
Allowing the animation to happen irrespective of animators solves the problem.
Change-Id: Ifa72286cdc6ff785fcc999f3b951dd787e7003e9
xiaozhengdong [Tue, 4 Aug 2015 08:55:35 +0000 (16:55 +0800)]
hwui: add extension to support unpack operations in OpenGL ES 2.0
OpenGL ES 3.0+ lets us specify the row length for unpack operations
such as glTexSubImage2D(). This allows us to upload a sub-rectangle
of a texture. Also, the GL_EXT_unpack_subimage extension can also
support this feature in OpenGL ES 2.0
Change-Id: Id43c2c55c5eaefbace67087c955f0b4324fb2c35
Signed-off-by: xiaozhengdong <xiaozhengdong@xiaomi.com>
Yusuke Sato [Mon, 3 Aug 2015 23:21:10 +0000 (16:21 -0700)]
Clean up AssetManager::scanAndMergeZipLocked
Now that ZipFileRO::startIteration supports prefix/suffix matching,
we can pass dirName to the function for simpler code and slightly
better performance.
(cherry-pick of
c796ad0a8be6df4a3b354690dfe5ce1df8136c09)
Change-Id: I0e2ac58de28020c2af8d8e569a97592b09596185
Yusuke Sato [Mon, 3 Aug 2015 23:17:16 +0000 (16:17 -0700)]
Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
for better performance. Without the optimization, these two functions
may check more than 100k file names in the pre-installed APK files,
which can take a few seconds to finish even on a recent device.
(cherry-pick of
34fe3df8519523dbb4bc27010fa57f259d5e868d)
Bug:
21957428
Change-Id: I5ebe0438019958d883a7fda6bd92ea4484211d23
Matthew Williams [Mon, 3 Aug 2015 23:58:48 +0000 (23:58 +0000)]
Merge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED"
Todd Kennedy [Mon, 3 Aug 2015 17:44:45 +0000 (17:44 +0000)]
Merge "Add a trace constant for PackageManager"
Todd Kennedy [Mon, 3 Aug 2015 16:56:07 +0000 (09:56 -0700)]
Add a trace constant for PackageManager
Change-Id: Ida391be765c63d7b6da3d9fd9d1d975e51b4f3e7
Rayhaan Jaufeerally [Mon, 3 Aug 2015 12:54:28 +0000 (13:54 +0100)]
Add ICU as a java library for docs.
Change-Id: Ifd5f0a076e2cbdf0498c209c916d5a55aa12f0ce
Kevin Zhu [Mon, 29 Jun 2015 23:06:49 +0000 (16:06 -0700)]
Idle Job Start During SCREEN_ON or DREAMING_STOPPED
When the screen goes off or dreaming start, an alarm will be
scheduled and idle state will be true when the alarm expired.
If the screen goes on or dreaming stop happens before
the alarm expired, the alarm isn't cancelled and idle state is
set to be true when the device is in SCREEN_ON or DREADING_STOPPED
state. There is also a case that Idle alarm triggered when
the screen on or dreaming stop just start to be processed.
ACTION_TRIGGER_IDLE will set mIdle to true during screen on
or dreaming stop.
In this patch, the alarm will be cancelled when the screen goes
on or dreaming stop and screen-on flag will be set. So the idle
state can only be set when screen is off or dreaming started.
Change-Id: I06ae4b7fd77901f9570ce0459d2299bbfd4b46b4
Yusuke Sato [Fri, 31 Jul 2015 23:13:16 +0000 (23:13 +0000)]
Merge "Distinguish user-requested shutdown from power-related ones"
Yusuke Sato [Tue, 21 Jul 2015 22:52:11 +0000 (15:52 -0700)]
Distinguish user-requested shutdown from power-related ones
With this patch, when the user requested shutdown,
PowerManagerService sets sys.powerctl is set to
"shutdown,userrequested", and init runs fsck on shutdown.
When shutdown is triggered due to a low power state etc.,
the service sets the property to "shutdown,", and init
immediately shuts down the system without running the
command.
This is a follow-up CL for http://r.android.com/158525.
Bug:
21853106
Change-Id: Iae72990130fe9aa479c802f77301438190dbbfb3
Elliott Hughes [Thu, 30 Jul 2015 15:19:09 +0000 (15:19 +0000)]
Merge "Use _WIN32 rather than HAVE_WINSOCK."
riddle_hsu [Thu, 30 Jul 2015 13:52:58 +0000 (21:52 +0800)]
Fix NPE in JobStore when jobs.xml is empty.
It is possible that jobs.xml does not have valid content
if the device meet unexpected power off or reboot during
writing the file, then parser.getName() may get null string
on next boot.
Because log does not allow to print null message.
It will result boot fail:
Caused by: java.lang.NullPointerException: println needs a message
at android.util.Log.println_native(Native Method)
at android.util.Slog.d
at com.android.server.job.JobStore
$ReadJobMapFromDiskRunnable.readJobMapImpl
Change-Id: Icd485096e2f00f4028428a9ad95cd0ef66b2dca0
Elliott Hughes [Thu, 30 Jul 2015 00:49:27 +0000 (17:49 -0700)]
Use _WIN32 rather than HAVE_WINSOCK.
Change-Id: I0821d2af8473c359e8b73aec455000cb7c42f690
Elliott Hughes [Wed, 29 Jul 2015 23:13:54 +0000 (23:13 +0000)]
Merge "Move frameworks/base/tools/ off AndroidConfig.h."
Elliott Hughes [Wed, 29 Jul 2015 21:35:18 +0000 (14:35 -0700)]
Move frameworks/base/tools/ off AndroidConfig.h.
Change-Id: Ibc7abb67a56945a9618bc91ccdbebe4c806879a5
Elliott Hughes [Wed, 29 Jul 2015 15:47:46 +0000 (15:47 +0000)]
Merge "Use _WIN32 rather than HAVE_WINDOWS_PATHS."
Elliott Hughes [Wed, 29 Jul 2015 15:44:17 +0000 (08:44 -0700)]
Use _WIN32 rather than HAVE_WINDOWS_PATHS.
Change-Id: Ib1ae71dfbb20e3e5309ed737f48382cc42d2583f
Nick Kralevich [Sun, 26 Jul 2015 04:25:56 +0000 (04:25 +0000)]
Merge "ActivityManagerService: delete unnecessary mkdir"
Nick Kralevich [Sun, 26 Jul 2015 04:12:09 +0000 (21:12 -0700)]
ActivityManagerService: delete unnecessary mkdir
/data/anr is now created in init.rc. This code is unnecessary.
Bug:
22385254
Change-Id: Ide6c9749c27668523f9316049a1d40d961f2276d
Andreas Gampe [Fri, 24 Jul 2015 22:38:28 +0000 (22:38 +0000)]
Merge "Frameworks/base: Hand fingerprint to ART"
Andreas Gampe [Fri, 24 Jul 2015 21:19:44 +0000 (14:19 -0700)]
Frameworks/base: Hand fingerprint to ART
To allow ANR dumps to be symbolized easily, hand the build
fingerprint to the runtime.
Bug:
22693991
(cherry picked from commit
e60825033fdde9eefaeec768a28b907e2d22f10c)
Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508
Ying Wang [Fri, 24 Jul 2015 00:38:08 +0000 (00:38 +0000)]
Merge "Add phony source target in the generated dependency file of aidl."
Stephen Hines [Thu, 23 Jul 2015 22:26:05 +0000 (22:26 +0000)]
Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."
Colin Cross [Thu, 23 Jul 2015 18:23:06 +0000 (18:23 +0000)]
Merge "Use build_number from file"
Ying Wang [Thu, 23 Jul 2015 00:42:35 +0000 (17:42 -0700)]
Add phony source target in the generated dependency file of aidl.
This fixes make error when the source .aidl file is moved around but
its path relative to LOCAL_PATH doesn't change.
Bug:
22666539
Change-Id: Idf2492145e4927779d184932a09d61e4fe8ded0f
Elliott Hughes [Wed, 22 Jul 2015 01:00:11 +0000 (01:00 +0000)]
Merge "aapt: expat exports its header files now."
Elliott Hughes [Tue, 21 Jul 2015 18:39:21 +0000 (11:39 -0700)]
aapt: expat exports its header files now.
(cherrypick of
51348d2007b801c7bd7350f72e2300f1a5a41dd1)
Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174
Colin Cross [Fri, 17 Jul 2015 00:55:31 +0000 (17:55 -0700)]
Use build_number from file
Improve incremental ninja builds by keeping the command line the same
across builds.
Change-Id: If9dfcee74a4d282c183f9669e14a89104c115a71
Matt Wala [Mon, 20 Jul 2015 22:35:27 +0000 (15:35 -0700)]
RenderScript: implement a Script entry point for calling a
reduce-style kernel.
Bug:
22631253
This adds a new (currently hidden) API to the Script class and the
corresponding code for the RenderScript JNI layer.
Change-Id: I40f19aaeb90411b859bd6b0bffc3f071fa327c21
Miao Wang [Mon, 20 Jul 2015 23:57:19 +0000 (23:57 +0000)]
Merge "[RenderScript] Add docs advising users about dstAtop bug."
Miao Wang [Mon, 20 Jul 2015 22:05:31 +0000 (15:05 -0700)]
[RenderScript] Add docs advising users about dstAtop bug.
Bug:
22047392
Change-Id: I736a697276020687c20dff515aabb1be1776f8c0
(cherry picked from commit
ffb1a9bed0788d3547f085bfb9d254004e0db1e3)
Stephen Hines [Fri, 17 Jul 2015 22:45:15 +0000 (22:45 +0000)]
Merge "Add a flag to the API to specify -O0 on the bcc command line."
Neil Fuller [Fri, 17 Jul 2015 10:09:23 +0000 (10:09 +0000)]
Merge "Migrate Resources.java to use ICU4j drectly."
verena beckham [Fri, 22 May 2015 15:47:53 +0000 (16:47 +0100)]
Add a flag to the API to specify -O0 on the bcc command line.
Add a flag CREATE_FLAG_OPT_LEVEL_0 to set the optimization level to 0 when calling bcc.
This will result in an object file that is easier to debug.
Change-Id: I0384dca098fa0d9ae0f2e02e798da9de342c1122
Signed-off-by: verena beckham <verena@codeplay.com>
Miao Wang [Thu, 16 Jul 2015 18:00:01 +0000 (18:00 +0000)]
Merge "fix BNNM docs"
Miao Wang [Wed, 15 Jul 2015 18:35:28 +0000 (11:35 -0700)]
fix BNNM docs
bug:
22507076
Change-Id: I5fdffdde597d97b1dde77574d096b81bff4aa382
(cherry picked from commit
d7d413ad0bfaea2d4bb4adcd8011239c2f5f74ae)
Neil Fuller [Thu, 16 Jul 2015 10:26:17 +0000 (10:26 +0000)]
Merge "Fix NativeCrashListener"
Narayan Kamath [Thu, 16 Jul 2015 08:57:17 +0000 (08:57 +0000)]
Merge "docs: Add an explicit dependency on libcore/Docs.mk"
Narayan Kamath [Tue, 14 Jul 2015 12:39:23 +0000 (13:39 +0100)]
docs: Add an explicit dependency on libcore/Docs.mk
We include libcore sources in apicheck / docs targets so we must
regenerate the stubs or api definitions whenever the list of libcore
sources changes.
Change-Id: I9383015069bc4064d5d06d3d540047cd408e24c7
Chris Tate [Thu, 16 Jul 2015 00:09:37 +0000 (00:09 +0000)]
Merge "Fix a bug disappearing installerPackageName info of packages after reboot."
Neil Fuller [Wed, 15 Jul 2015 16:38:28 +0000 (17:38 +0100)]
Fix NativeCrashListener
In the move from InetUnixAddress to UnixSocketAddress
commit
e9d537506bf19375fb932ac7d25ac9a9e3aef61d did not modify
the Os.accept() call in NativeCrashListener. It was passing
an empty InetSocketAddress.
The type could have been changed, but the peer address is
never used and it is safe to pass a null.
Bug:
3106438
Change-Id: I2a61221c4504657b3e1de848b0b493f202726126
Rayhaan Jaufeerally [Wed, 15 Jul 2015 14:25:15 +0000 (15:25 +0100)]
Migrate Resources.java to use ICU4j drectly.
This change means that NativePluralRules can be removed in its entirety
because this is the only usage of that class.
Using a small benchmark from the NativePluralResources test, ICU4c code
takes 38.6 us and ICU4j code takes 49.2us to execute.
Change-Id: I5dbf643807c024a9c9c0f1292363fa8e39db965a
Narayan Kamath [Tue, 14 Jul 2015 10:47:44 +0000 (10:47 +0000)]
Merge "Delete some obsolete test code."
Mathieu Chartier [Mon, 13 Jul 2015 16:41:10 +0000 (16:41 +0000)]
Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses"
Neil Fuller [Mon, 13 Jul 2015 15:02:04 +0000 (15:02 +0000)]
Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."
Elliott Hughes [Sat, 11 Jul 2015 01:08:13 +0000 (01:08 +0000)]
Merge "Revert "frameworks/base: libexpat now exports its headers.""
Elliott Hughes [Sat, 11 Jul 2015 01:07:39 +0000 (01:07 +0000)]
Revert "frameworks/base: libexpat now exports its headers."
This reverts commit
2f31b66c04b1e80fd039418edf41e74f67b68143.
Change-Id: Ib4ce610d1767db5c72c54d33520e8bdf50171a18
Elliott Hughes [Sat, 11 Jul 2015 00:40:47 +0000 (00:40 +0000)]
Merge "frameworks/base: libexpat now exports its headers."
Mathieu Chartier [Fri, 10 Jul 2015 20:44:42 +0000 (13:44 -0700)]
Change conditionallyCheckInstanceCounts to use countInstancesOfClasses
countInstancesOfClasses allows passing multiple classes unlike
countInstanceOfClass. This provides a speedup since we dont traverse
the heap multiple times.
Changed ActivityThread.dumpMemInfo to do a GC since countInstancesOfClass
no longer does GC before counting.
https://code.google.com/p/android/issues/detail?id=177552
Change-Id: Ia85684f40cf59a52aa71a8479c711a994651209b
Elliott Hughes [Fri, 10 Jul 2015 18:12:22 +0000 (11:12 -0700)]
frameworks/base: libexpat now exports its headers.
Change-Id: Iaba3d57db18ebdd89e4a993436e9bf844722ff87
Neil Fuller [Wed, 8 Jul 2015 11:57:15 +0000 (12:57 +0100)]
Switch shutdownInput / shutdownOutput to using Os.shutdown.
Bug:
3106438
Change-Id: I2c4817e435c6b253d6c507ea57bdfdfe45df8862
Narayan Kamath [Thu, 9 Jul 2015 17:22:21 +0000 (18:22 +0100)]
Delete some obsolete test code.
- Get rid of obsolete annotations in MediaInserterTest.
- Drop support for @BrokenTest and @SideEffect. Nobody uses
SideEffect and none of the tests that use this test runner
(vm-tests-tf, essentially) use @BrokenTest.
Change-Id: Id73c4d4eda8031689f9263c85b563c29e635d446
Narayan Kamath [Thu, 9 Jul 2015 17:22:13 +0000 (17:22 +0000)]
Merge "Remove @ToBeFixed from knowntags."
Narayan Kamath [Thu, 9 Jul 2015 16:54:45 +0000 (17:54 +0100)]
Remove @ToBeFixed from knowntags.
It's used nowhere and will be deleted shortly.
Change-Id: Ie87f16cd060445c0e0ccac4e9a192ca266c92851
Neil Fuller [Thu, 9 Jul 2015 11:11:08 +0000 (11:11 +0000)]
Merge "Switch LocalSocketImpl.accept() over to using Os.accept()"
Neil Fuller [Wed, 8 Jul 2015 10:33:54 +0000 (11:33 +0100)]
Switch LocalSocketImpl.accept() over to using Os.accept()
Bug:
3106438
Change-Id: I3b4a07cc2283c3cfdbaf3d2460f37264f67690e3
Neil Fuller [Thu, 9 Jul 2015 09:44:27 +0000 (09:44 +0000)]
Merge "Switch from InetUnixAddress to UnixSocketAddress"
hyemin.hwang [Thu, 9 Jul 2015 00:16:12 +0000 (09:16 +0900)]
Fix a bug disappearing installerPackageName info of packages after reboot.
If user install apps from playstore, system has installerPackageName attribute of app.
but, after reboot, some apps(have sharedUserID) installerPackageName attribute disappearing.
because lack of copy routine.
So, I added copy routine(installerPackageName).
Testcase :
1. Install app(has sharedUserId, ex Lync2013) from market.
2. Confirm package info from packages.xml(exist installer info).
3. reboot.
4. Re-confirm package info from packages.xml(not exist installer info).
Change-Id: I5f9597b0f0f23be21efdfc7c7780ce7cfd2b9672
Elliott Hughes [Wed, 8 Jul 2015 18:12:21 +0000 (18:12 +0000)]
Merge "Android always has <malloc.h>."
Neil Fuller [Wed, 8 Jul 2015 10:18:13 +0000 (10:18 +0000)]
Merge "Move listen() over to using android.system.Os"
Elliott Hughes [Wed, 8 Jul 2015 02:19:34 +0000 (19:19 -0700)]
Android always has <malloc.h>.
Change-Id: I9e18daeec26380c439f823e6a55ee61773c1b680
Neil Fuller [Tue, 7 Jul 2015 16:11:47 +0000 (16:11 +0000)]
Merge "Reimplement LocalSocket methods using android.system.Os"
Neil Fuller [Tue, 7 Jul 2015 15:58:00 +0000 (16:58 +0100)]
Switch from InetUnixAddress to UnixSocketAddress
UnixSocketAddress is replacing InetUnixAddress.
Bug:
3106438
Change-Id: I7c03fa357adfb3221908294fd254c8faae91fd1b
Elliott Hughes [Tue, 7 Jul 2015 06:00:55 +0000 (06:00 +0000)]
Merge "Fix "Bluetooh" logging typo."
Elliott Hughes [Tue, 7 Jul 2015 05:10:36 +0000 (22:10 -0700)]
Fix "Bluetooh" logging typo.
Change-Id: I2b9aea64f1b53e100ead6e71835bf5935b410eb9
Mike Lockwood [Mon, 6 Jul 2015 17:10:31 +0000 (17:10 +0000)]
Merge "Miss USB device Interface from UsbManager.getDeviceList()."
wang.zhenyu [Sat, 4 Jul 2015 09:00:16 +0000 (17:00 +0800)]
Miss USB device Interface from UsbManager.getDeviceList().
In the scenario that you connect more than one device to android phone with an usb hub,
when you attach the second device,mNewConfigurationis is still corresponded to the first
device unless another mNewConfiguration is created by a new operation.
However,before another mNewConfiguration is created,setInterfaces() in addUsbConfiguration()
has already been executed. Problem is that mNewInterfaces has already been cleared when
it finished endUsbDeviceAdded for the first device. As a result,the UsbInterface descriptor
in the first device's Configuration descriptor is set to null.
Change-Id: I0ba4f07c809d07ebebed633e43c3ee8e2e4c5060
Neil Fuller [Fri, 3 Jul 2015 16:58:00 +0000 (17:58 +0100)]
Move listen() over to using android.system.Os
Bug:
3106438
Change-Id: I9b4d1d58d84a28828555ae863e86530995191f2c
Neil Fuller [Fri, 3 Jul 2015 14:06:23 +0000 (15:06 +0100)]
Reimplement LocalSocket methods using android.system.Os
InputStream.available()
OutputStream.flush()
Bug:
3106438
Change-Id: I3a9425c323229e27bb72f6232dd13f7579586840
Neil Fuller [Fri, 3 Jul 2015 14:07:33 +0000 (14:07 +0000)]
Merge "Switch to using android.system.Os for more calls"
Neil Fuller [Fri, 3 Jul 2015 09:59:17 +0000 (10:59 +0100)]
Switch to using android.system.Os for more calls
The methods being switched here should involve no important
semantic changes. socket.getSoTimeout() is now implemented:
previously it would have returned 0 in all cases.
Some tidy up of unimplemented / commented code.
Switching other calls to use Os would carry more risk and
will be handled separately they can be switched safely.
Bug:
3106438
Change-Id: I5526249395565fee6e43f159a2b5975b0d41d058
Narayan Kamath [Thu, 2 Jul 2015 11:18:18 +0000 (11:18 +0000)]
Merge "Delete unused testing scripts and WithFramework."
Narayan Kamath [Thu, 25 Jun 2015 13:22:00 +0000 (14:22 +0100)]
Delete unused testing scripts and WithFramework.
These scripts haven't worked in a long time now. run_core_test
uses VM options that aren't supported and WithFramework (which is
unmaintained) and run_junit.sh refers to an APK that doesn't
exist anymore.
If anyone wishes to run these tests individually, they can just
use vogar instead :
$ make vogar vogar.jar
$ vogar --mode=activity frameworks/base/tests/CoreTests/android/core/Sha1Test.java
This also allows us to delete the WithFramework class, which was
only referenced by these obsolete scripts.
bug:
22078684
Change-Id: I481f6721d51d50456421a1526c370b93aec9b351
Narayan Kamath [Wed, 1 Jul 2015 13:32:04 +0000 (13:32 +0000)]
Merge "Remove memory leak in PersistentDataBlockService jni"
Henrik Baard [Tue, 23 Jun 2015 07:36:36 +0000 (09:36 +0200)]
Remove memory leak in PersistentDataBlockService jni
When calling the methods
com_android_server_PersistentDataBlockService_getBlockDeviceSize()
com_android_server_PersistentDataBlockService_wipe()
memory is leaked because string created by
GetStringUTFChars() is not released.
Use ScopedUtfChars instead to ensure that memory is released.
Change-Id: I880a6d66a4824778b411b858774b8ffa009c1e17
Miao Wang [Wed, 1 Jul 2015 05:53:41 +0000 (05:53 +0000)]
Merge "[RenderScript] update the type of offsets for BLAS.BNNM"
Miao Wang [Tue, 30 Jun 2015 00:43:03 +0000 (17:43 -0700)]
[RenderScript] update the type of offsets for BLAS.BNNM
bug:
22184114
Change-Id: I7e7132aa3563f32de32640567b381f8f5bddf491
(cherry picked from commit
6099ee6e081904e73e0fad331e326b0607b6b1dc)
John Hoford [Tue, 30 Jun 2015 22:34:43 +0000 (22:34 +0000)]
Merge "add comment about xor not being porter/duff Bug:
21934855"
John Hoford [Tue, 30 Jun 2015 01:15:22 +0000 (18:15 -0700)]
add comment about xor not being porter/duff
Bug:
21934855
Change-Id: I99394bd8a7a40a220c05118564b532f2533da38a
Stephen Hines [Tue, 30 Jun 2015 01:11:14 +0000 (01:11 +0000)]
Merge "Replace parentheses with curly braces to fix vector doc bug."
Stephen Hines [Tue, 30 Jun 2015 01:04:37 +0000 (18:04 -0700)]
Replace parentheses with curly braces to fix vector doc bug.
https://code.google.com/p/android/issues/detail?id=178299
Change-Id: I3ae31d48a39e8db9976fdedde560e870b23e2c83
Yang Ni [Mon, 29 Jun 2015 22:39:49 +0000 (22:39 +0000)]
Merge "Add Java doc comments on script group name reuse"
Yang Ni [Thu, 25 Jun 2015 00:06:10 +0000 (17:06 -0700)]
Add Java doc comments on script group name reuse
b/
21999787
Change-Id: Id9a7bad4ce91f3afdd82a1288cf94430f3aef9bb
(cherry picked from commit
dbb6fd58a4b113f8761ce825ad5b91e50c170971)
Yusuke Sato [Mon, 29 Jun 2015 17:49:28 +0000 (17:49 +0000)]
Merge "Rename ZipEntryName to ZipString"
Wale Ogunwale [Mon, 29 Jun 2015 15:09:29 +0000 (15:09 +0000)]
Merge "Use the correct lock to protect members in PolicyControl"
tiger_huang [Mon, 29 Jun 2015 09:17:30 +0000 (17:17 +0800)]
Use the correct lock to protect members in PolicyControl
Members in PolicyControl can be accessed by multiple threads via the
public functions called by PhoneWindowManager. Most of the functions
are called with the window-manager-lock held, but reloadFromSetting()
is an exception.
In this patch, we acquire the window-manager-lock before calling
reloadFromSetting() to ensure accessing the members with the same
lock held.
Change-Id: I54ac5cab2a2d74c568fa96145f7a6741c6d99e36
Yusuke Sato [Thu, 25 Jun 2015 21:58:16 +0000 (14:58 -0700)]
Rename ZipEntryName to ZipString
Also add a 4th parameter to StartIteration(). This is for
https://android-review.googlesource.com/#/c/156771/.
Bug:
21957428
Change-Id: Ifbf9aec2f04b214b57e99c306282d7c0d39675a9
Tenghui Zhu [Thu, 25 Jun 2015 21:07:12 +0000 (21:07 +0000)]
Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN."
Lazar Trsic [Tue, 23 Jun 2015 09:46:49 +0000 (11:46 +0200)]
Limit dotProduct value to 1.0f, so acosf would not return NaN.
Due to precision loss of float math, we sometimes get 1.
000001f for
dotProduct. This causes NaN result from acosf() and floor() funcs.
At the moment, this does not cause any problems on ARM, as casting
NaN to int results in 0. On mips however (possibly on x86), such cast
gives INT_MAX, so crash occurs when trying to use the resulting value.
Change-Id: I8e0285a0306a65b8469d9f4885c19665066fc4c8