OSDN Git Service
Dan Albert [Fri, 14 Aug 2015 21:33:07 +0000 (21:33 +0000)]
am
4a2a890b: Merge "Fix mismatched new[]/delete."
* commit '
4a2a890b32a1e8c3ffeea82b3c12f707b5a9b8f4':
Fix mismatched new[]/delete.
Dan Albert [Fri, 14 Aug 2015 21:23:29 +0000 (21:23 +0000)]
Merge "Fix mismatched new[]/delete."
Dan Albert [Fri, 14 Aug 2015 21:12:29 +0000 (14:12 -0700)]
Fix mismatched new[]/delete.
The new clang will emit a warning for this.
Change-Id: Ie0edc46461eb5edb2a7ad33a3a7f6cef2d825c36
Nick Kralevich [Wed, 12 Aug 2015 23:57:58 +0000 (23:57 +0000)]
am
10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin."
* commit '
10e0f07975e6e446763b733bb438df5715c3693d':
SELinuxPolicyInstallReceiver: Switch to file_contexts.bin.
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:31:01 +0000 (22:31 +0000)]
am
6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."
* commit '
6fdc633380bb4744595575449101ee171b690175':
Lose HAVE_ANDROID_OS from frameworks/base.
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:57:49 +0000 (14:57 +0000)]
am
daf8d905: Merge "Add ICU as a java library for docs."
* commit '
daf8d9056815b7435bdf4d07da3f938f11052691':
Add ICU as a java library for docs.
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 23:38:47 +0000 (23:38 +0000)]
am
bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"
* commit '
bd4c482be9c060d92919080c37e0d14fca94d2aa':
Clean up AssetManager::scanAndMergeZipLocked
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:58:57 +0000 (17:58 +0000)]
am
a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
* commit '
a024acb8bab7e0e04f709fc9f927575f448e11db':
Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
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:59:57 +0000 (20:59 +0000)]
am
bc04d3ac: Merge "animateNoDamage failed to remove from current frame list"
* commit '
bc04d3acba766c1440e2ab0763aa1352efcf54a8':
animateNoDamage failed to remove from current frame list
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 20:39:07 +0000 (20:39 +0000)]
am
93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0"
* commit '
93c14069588eac2c652263295bc89eb2a2eb3d6b':
hwui: add extension to support unpack operations in OpenGL ES 2.0
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:52:54 +0000 (17:52 +0000)]
am
0c53f72e: Merge "Fix NPE in JobStore when jobs.xml is empty."
* commit '
0c53f72eda9355dc7ceb45c9cf53527258d89399':
Fix NPE in JobStore when jobs.xml is empty.
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 [Tue, 4 Aug 2015 00:08:42 +0000 (00:08 +0000)]
am
608ad140: Merge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED"
* commit '
608ad1409dc3cd86a66208ddaa31e3a4c54adfac':
Idle Job Start During SCREEN_ON or DREAMING_STOPPED
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:54:53 +0000 (17:54 +0000)]
am
40f0efe0: Merge "Add a trace constant for PackageManager"
* commit '
40f0efe03df87cf340de089bcb09010a88f8a120':
Add a trace constant for PackageManager
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:25:48 +0000 (23:25 +0000)]
am
158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit '
158560ad66f860ab9bb822f98a0ef9cf3afa922f':
Distinguish user-requested shutdown from power-related ones
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:32:51 +0000 (15:32 +0000)]
am
f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '
f8a6a2f602ad4ec049b2d2d4741571a76c3d014b':
Use _WIN32 rather than HAVE_WINSOCK.
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:29:31 +0000 (23:29 +0000)]
am
84a04d52: Merge "Move frameworks/base/tools/ off AndroidConfig.h."
* commit '
84a04d52e7118f67e9a099fdbf55111f1c7a9010':
Move frameworks/base/tools/ off AndroidConfig.h.
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 16:17:14 +0000 (16:17 +0000)]
am
7d71d88c: Merge "Use _WIN32 rather than HAVE_WINDOWS_PATHS."
* commit '
7d71d88c6d305d6ed19b320944f4ce644db82240':
Use _WIN32 rather than HAVE_WINDOWS_PATHS.
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:39:19 +0000 (04:39 +0000)]
am
e942b459: Merge "ActivityManagerService: delete unnecessary mkdir"
* commit '
e942b4596a12685cb722ddef4e59e279e6fd513f':
ActivityManagerService: delete unnecessary mkdir
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:51:49 +0000 (22:51 +0000)]
am
c0999f78: Merge "Frameworks/base: Hand fingerprint to ART"
* commit '
c0999f7877616826f7c371fb49b081b82ad9b067':
Frameworks/base: Hand fingerprint to ART
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:54:53 +0000 (00:54 +0000)]
am
430c8c3e: Merge "Add phony source target in the generated dependency file of aidl."
* commit '
430c8c3e48b361f75d29d05b8fda3aac22ceb1f9':
Add phony source target in the generated dependency file of aidl.
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:39:29 +0000 (22:39 +0000)]
am
6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."
* commit '
6430812a9381af01b0c7b48cedd6a11c1add6942':
RenderScript: implement a Script entry point for calling a reduce-style kernel.
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:48:22 +0000 (18:48 +0000)]
am
01efd7e8: Merge "Use build_number from file"
* commit '
01efd7e820edb9677491f28af999d825f21711a4':
Use build_number from file
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:12:36 +0000 (01:12 +0000)]
am
86d5fc28: Merge "aapt: expat exports its header files now."
* commit '
86d5fc2874b4c17bd4f48ae307e49ba8108e11f0':
aapt: expat exports its header files now.
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 [Tue, 21 Jul 2015 00:08:36 +0000 (00:08 +0000)]
am
37353dc1: Merge "[RenderScript] Add docs advising users about dstAtop bug."
* commit '
37353dc13e11000473f5aa43d5713816f2b6a83f':
[RenderScript] Add docs advising users about dstAtop bug.
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:58:49 +0000 (22:58 +0000)]
am
79a1bde2: Merge "Add a flag to the API to specify -O0 on the bcc command line."
* commit '
79a1bde2e0f38507738743e490beb895dae7b03e':
Add a flag to the API to specify -O0 on the bcc command line.
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:22:19 +0000 (10:22 +0000)]
am
7ce3847d: Merge "Migrate Resources.java to use ICU4j drectly."
* commit '
7ce3847d753688c5339216dd174c094e2996fdf9':
Migrate Resources.java to use ICU4j drectly.
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:13:51 +0000 (18:13 +0000)]
am
10653cef: Merge "fix BNNM docs"
* commit '
10653cef2ae7eb6e1dff1063ddde24347c350bae':
fix BNNM docs
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:42:05 +0000 (10:42 +0000)]
am
eccbc7c9: Merge "Fix NativeCrashListener"
* commit '
eccbc7c96f3f3dfa82f25362cf4ed0db3d9a6cb6':
Fix NativeCrashListener
Neil Fuller [Thu, 16 Jul 2015 10:26:17 +0000 (10:26 +0000)]
Merge "Fix NativeCrashListener"
Narayan Kamath [Thu, 16 Jul 2015 10:10:28 +0000 (10:10 +0000)]
am
1ecfdf33: Merge "docs: Add an explicit dependency on libcore/Docs.mk"
* commit '
1ecfdf33ee593c0e80cee5e11f4c0a0fd0071233':
docs: Add an explicit dependency on libcore/Docs.mk
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:24:30 +0000 (00:24 +0000)]
am
2fccb66d: Merge "Fix a bug disappearing installerPackageName info of packages after reboot."
* commit '
2fccb66debb6fb26ba6072ccc83ed56d45cc55fb':
Fix a bug disappearing installerPackageName info of packages after reboot.
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 11:05:07 +0000 (11:05 +0000)]
am
b4db7923: Merge "Delete some obsolete test code."
* commit '
b4db7923818393c5c839dba0d43bec36da98759c':
Delete some obsolete test code.
Mathieu Chartier [Tue, 14 Jul 2015 11:05:01 +0000 (11:05 +0000)]
am
ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses"
* commit '
ebac4d1b0858ee02e095e35969c8f7421a0f5cea':
Change conditionallyCheckInstanceCounts to use countInstancesOfClasses
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:11:11 +0000 (15:11 +0000)]
am
886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."
* commit '
886630c0d8adc17c494edf19a30b06473a687fcb':
Switch shutdownInput / shutdownOutput to using Os.shutdown.
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:18:00 +0000 (01:18 +0000)]
am
188af044: Merge "Revert "frameworks/base: libexpat now exports its headers.""
* commit '
188af044685802cfd5266fe45b68528a2413ce3d':
Revert "frameworks/base: libexpat now exports its headers."
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:52:48 +0000 (00:52 +0000)]
am
220b61f1: Merge "frameworks/base: libexpat now exports its headers."
* commit '
220b61f14387e492be4ae8b819a5f96ca9b8dc36':
frameworks/base: libexpat now exports its headers.
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:38:46 +0000 (17:38 +0000)]
am
43a2aca4: Merge "Remove @ToBeFixed from knowntags."
* commit '
43a2aca4c279d3db8abdf4692249134fdd69bd96':
Remove @ToBeFixed from knowntags.
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."