Tom Cherry
b9ac485a8e
am 49948146: Merge "bundle init.rc contents with its service"
...
* commit '49948146dc7449bd9caaae283413ec76633ec021':
bundle init.rc contents with its service
2015-08-21 17:57:31 +00:00
Tom Cherry
49948146dc
Merge "bundle init.rc contents with its service"
2015-08-21 17:42:30 +00:00
Chong Zhang
7efe9f67f5
am 5923d161: Merge "wm: call displayReady for all built in displays when system is ready."
...
* commit '5923d161d0680a5ea107fa4104b0a6867237ba4a':
wm: call displayReady for all built in displays when system is ready.
2015-08-20 19:56:58 +00:00
Chong Zhang
5923d161d0
Merge "wm: call displayReady for all built in displays when system is ready."
2015-08-20 19:48:31 +00:00
Elliott Hughes
260cb53fdb
am ce4fbb4d: Merge "zygote: fix memory leak when fork process"
...
* commit 'ce4fbb4da675c447ec839deaad05c0e88701bc2c':
zygote: fix memory leak when fork process
2015-08-20 01:24:30 +00:00
Elliott Hughes
ce4fbb4da6
Merge "zygote: fix memory leak when fork process"
2015-08-20 01:14:00 +00:00
Tom Cherry
c2de7a7e87
bundle init.rc contents with its service
...
Bug: 23186545
Change-Id: I080e73d6a124873c2ddd0fba85315d7082faf3f5
2015-08-19 17:24:47 -07:00
Mykola Kondratenko
1ca062f21e
zygote: fix memory leak when fork process
...
Release memory allocated by GetIntArrayElements.
Change-Id: If7ce2a78a480e58b0376352ce438dbe51f664f3a
2015-08-19 09:41:03 +02:00
Tao Bao
2e3746abc7
am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."
...
* commit '9bcb0fcc217e35f8290ee5f283fae86a6306ab25':
Recursively delete directories in handleAftermath().
2015-08-18 22:32:48 +00:00
Tao Bao
9bcb0fcc21
Merge "Recursively delete directories in handleAftermath()."
2015-08-18 22:26:16 +00:00
Tao Bao
5065e12dbe
Recursively delete directories in handleAftermath().
...
RecoverySystem.handleAftermath() is called to clean up recovery-related
files. It needs to handle non-empty directories as well such as leftover
stashes from failed OTAs.
Bug: 23199081
Change-Id: I33fb326d376d04c793ad7b5948a10e8c1c572812
2015-08-18 13:48:17 -07:00
Elliott Hughes
12cf0f9c4c
am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
...
* commit 'eba23aaa765822c5ed8a152af00da1998d61409e':
Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
2015-08-17 21:01:59 +00:00
Elliott Hughes
eba23aaa76
Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
2015-08-17 20:51:00 +00:00
Elliott Hughes
e17788ceff
Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
...
Change-Id: Ideef62acbf53a442167c9b8038021affffef9e8a
2015-08-17 12:41:46 -07:00
Chris Craik
63d3a61064
am e3f0a881: Merge "Make the value for shadowRadius less than 1.0 work"
...
* commit 'e3f0a881c20072a644317330ecf7409c81e96888':
Make the value for shadowRadius less than 1.0 work
2015-08-14 22:13:43 +00:00
Chris Craik
e3f0a881c2
Merge "Make the value for shadowRadius less than 1.0 work"
2015-08-14 22:02:19 +00:00
Dan Albert
16e5aba9c8
am 4a2a890b: Merge "Fix mismatched new[]/delete."
...
* commit '4a2a890b32a1e8c3ffeea82b3c12f707b5a9b8f4':
Fix mismatched new[]/delete.
2015-08-14 21:33:07 +00:00
Dan Albert
4a2a890b32
Merge "Fix mismatched new[]/delete."
2015-08-14 21:23:29 +00:00
Dan Albert
8dc8313c3e
Fix mismatched new[]/delete.
...
The new clang will emit a warning for this.
Change-Id: Ie0edc46461eb5edb2a7ad33a3a7f6cef2d825c36
2015-08-14 14:12:29 -07:00
Nick Kralevich
f3ae260367
am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin."
...
* commit '10e0f07975e6e446763b733bb438df5715c3693d':
SELinuxPolicyInstallReceiver: Switch to file_contexts.bin.
2015-08-12 23:57:58 +00:00
Nick Kralevich
10e0f07975
Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin."
2015-08-12 23:46:28 +00:00
Elliott Hughes
39669d7f6b
am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."
...
* commit '6fdc633380bb4744595575449101ee171b690175':
Lose HAVE_ANDROID_OS from frameworks/base.
2015-08-12 22:31:01 +00:00
Elliott Hughes
6fdc633380
Merge "Lose HAVE_ANDROID_OS from frameworks/base."
2015-08-12 22:21:46 +00:00
Elliott Hughes
ba3fe56edc
Lose HAVE_ANDROID_OS from frameworks/base.
...
Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e
2015-08-12 14:49:53 -07:00
Neil Fuller
14b884c16e
am daf8d905: Merge "Add ICU as a java library for docs."
...
* commit 'daf8d9056815b7435bdf4d07da3f938f11052691':
Add ICU as a java library for docs.
2015-08-07 14:57:49 +00:00
Neil Fuller
daf8d90568
Merge "Add ICU as a java library for docs."
2015-08-07 14:46:06 +00:00
Yusuke Sato
61234deafe
am bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"
...
* commit 'bd4c482be9c060d92919080c37e0d14fca94d2aa':
Clean up AssetManager::scanAndMergeZipLocked
2015-08-05 23:38:47 +00:00
Yusuke Sato
bd4c482be9
Merge "Clean up AssetManager::scanAndMergeZipLocked"
2015-08-05 22:15:50 +00:00
Yusuke Sato
3383b141c3
am a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
...
* commit 'a024acb8bab7e0e04f709fc9f927575f448e11db':
Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
2015-08-05 17:58:57 +00:00
Yusuke Sato
a024acb8ba
Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
2015-08-05 17:46:18 +00:00
Stephen Smalley
1fd675815a
SELinuxPolicyInstallReceiver: Switch to file_contexts.bin.
...
Switch to file_contexts.bin.
Change-Id: I745a98c324075b42d8f20cf6cf36568896476f3e
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-08-05 13:40:49 -04:00
John Reck
906c8dea2e
am bc04d3ac: Merge "animateNoDamage failed to remove from current frame list"
...
* commit 'bc04d3acba766c1440e2ab0763aa1352efcf54a8':
animateNoDamage failed to remove from current frame list
2015-08-04 20:59:57 +00:00
John Reck
bc04d3acba
Merge "animateNoDamage failed to remove from current frame list"
2015-08-04 20:52:40 +00:00
John Reck
2fa3eec0e1
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
2015-08-04 20:39:07 +00:00
John Reck
93c1406958
Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0"
2015-08-04 19:55:53 +00:00
Matthew Williams
d6ef2313ff
am 0c53f72e: Merge "Fix NPE in JobStore when jobs.xml is empty."
...
* commit '0c53f72eda9355dc7ceb45c9cf53527258d89399':
Fix NPE in JobStore when jobs.xml is empty.
2015-08-04 17:52:54 +00:00
Matthew Williams
0c53f72eda
Merge "Fix NPE in JobStore when jobs.xml is empty."
2015-08-04 17:39:51 +00:00
Ye Ouyang
68eb3b22b0
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
2015-08-04 10:42:32 -05:00
xiaozhengdong
d538d30e2f
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>
2015-08-04 19:46:01 +08:00
Yusuke Sato
05f648e1d3
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
2015-08-03 17:24:42 -07:00
Yusuke Sato
957c23775f
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
2015-08-03 17:24:32 -07:00
Matthew Williams
b3448bf137
am 608ad140: Merge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED"
...
* commit '608ad1409dc3cd86a66208ddaa31e3a4c54adfac':
Idle Job Start During SCREEN_ON or DREAMING_STOPPED
2015-08-04 00:08:42 +00:00
Matthew Williams
608ad1409d
Merge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED"
2015-08-03 23:58:48 +00:00
Todd Kennedy
772c6c0d2d
am 40f0efe0: Merge "Add a trace constant for PackageManager"
...
* commit '40f0efe03df87cf340de089bcb09010a88f8a120':
Add a trace constant for PackageManager
2015-08-03 17:54:53 +00:00
Todd Kennedy
40f0efe03d
Merge "Add a trace constant for PackageManager"
2015-08-03 17:44:45 +00:00
Todd Kennedy
114beb21a0
Add a trace constant for PackageManager
...
Change-Id: Ida391be765c63d7b6da3d9fd9d1d975e51b4f3e7
2015-08-03 09:56:07 -07:00
Rayhaan Jaufeerally
2e47a6e5db
Add ICU as a java library for docs.
...
Change-Id: Ifd5f0a076e2cbdf0498c209c916d5a55aa12f0ce
2015-08-03 13:56:06 +01:00
Kevin Zhu
ccfe87356f
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
2015-08-02 22:10:25 -07:00
Yusuke Sato
b98e235364
am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
...
* commit '158560ad66f860ab9bb822f98a0ef9cf3afa922f':
Distinguish user-requested shutdown from power-related ones
2015-07-31 23:25:48 +00:00
Yusuke Sato
158560ad66
Merge "Distinguish user-requested shutdown from power-related ones"
2015-07-31 23:13:16 +00:00