Alex Klyubin
e48aec9e7f
am ff35642e: Merge "Remove DefaultHostnameVerifier from preloaded-classes."
...
* commit 'ff35642e4732771a275e0ba8147af4a5d77f8419':
Remove DefaultHostnameVerifier from preloaded-classes.
2014-12-18 17:45:35 +00:00
Alex Klyubin
ff35642e47
Merge "Remove DefaultHostnameVerifier from preloaded-classes."
2014-12-18 17:40:46 +00:00
Olawale Ogunwale
5cb6837f28
am 07bb03c4: Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService."
...
* commit '07bb03c42343d54d0a8eb609c74eebd9ecd0df9d':
Avoid deadlock between ActivityManagerService and ProcessStatsService.
2014-12-18 17:00:07 +00:00
Elliott Hughes
e37f3af76d
am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java."
...
* commit '5cd79d070828b79d8b7d4ecdc3bdbf862866ac9a':
Move the remaining ZygoteInit native code over to Java.
2014-12-18 17:00:01 +00:00
Olawale Ogunwale
07bb03c423
Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService."
2014-12-18 16:55:43 +00:00
Elliott Hughes
5cd79d0708
Merge "Move the remaining ZygoteInit native code over to Java."
2014-12-18 16:55:23 +00:00
Elliott Hughes
ba6982a16c
am 93241de7: Merge "Remove a bitrotted test."
...
* commit '93241de734c3b9cf20e8e8956e6f6ccacc5b5ef2':
Remove a bitrotted test.
2014-12-18 00:37:51 +00:00
Elliott Hughes
93241de734
Merge "Remove a bitrotted test."
2014-12-18 00:32:01 +00:00
Elliott Hughes
988fd73499
Remove a bitrotted test.
...
Change-Id: I4c44f2da0544dbfde8e340f7f477191725c5fb8b
2014-12-17 16:29:04 -08:00
Olawale Ogunwale
fd7819dbe0
am f62877d3: Merge "Prevent wrong system ui visibility callback after the user swipe"
...
* commit 'f62877d305d2da4876707137cefe0eaa1b2953c3':
Prevent wrong system ui visibility callback after the user swipe
2014-12-17 21:47:45 +00:00
Olawale Ogunwale
e3b07b4856
am 486a9942: Merge "[ActivityManager] Use synchronized to protect object"
...
* commit '486a9942ebc6e3efe04004afd759a53ab96517ec':
[ActivityManager] Use synchronized to protect object
2014-12-17 21:47:38 +00:00
Olawale Ogunwale
f62877d305
Merge "Prevent wrong system ui visibility callback after the user swipe"
2014-12-17 21:43:27 +00:00
Olawale Ogunwale
486a9942eb
Merge "[ActivityManager] Use synchronized to protect object"
2014-12-17 21:42:44 +00:00
Elliott Hughes
26b56e628b
Move the remaining ZygoteInit native code over to Java.
...
Bug: 18719692
Change-Id: I5f9834edecdbcc065a33a9921c740a53441636a4
2014-12-17 12:28:29 -08:00
Elliott Hughes
a1beb930f5
am e6d63b94: Merge "Rewrite selectReadable JNI in Java."
...
* commit 'e6d63b94627d0072ff1468feca71698df1a0b64e':
Rewrite selectReadable JNI in Java.
2014-12-17 18:26:33 +00:00
Elliott Hughes
e6d63b9462
Merge "Rewrite selectReadable JNI in Java."
2014-12-17 18:21:06 +00:00
Narayan Kamath
681e6df122
am 6d41504d: Merge "Move frameworks users over to libcore hex encoding API."
...
* commit '6d41504d2c2111a55a4c06dd6b183318efd7c598':
Move frameworks users over to libcore hex encoding API.
2014-12-17 13:39:32 +00:00
Narayan Kamath
6d41504d2c
Merge "Move frameworks users over to libcore hex encoding API."
2014-12-17 13:34:00 +00:00
Tim Murray
68a81bd881
am 8de16999: Merge "Fix typo with register native allocation."
...
* commit '8de169993f0078bfdd064499c48b9d124cb438be':
Fix typo with register native allocation.
2014-12-16 21:36:43 +00:00
Tim Murray
8de169993f
Merge "Fix typo with register native allocation."
2014-12-16 21:30:58 +00:00
Ying Wang
49b2f00acf
am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
...
* commit 'c80c12dda9c1ce11affdccb2923b2e570daacfcd':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
2014-12-16 20:50:58 +00:00
Ying Wang
c80c12dda9
Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
2014-12-16 20:46:17 +00:00
Ying Wang
34db51cdd7
Cleanup Obsolete LOCAL_PRELINK_MODULE.
...
Bug: 18675947
Change-Id: If4909c5f8495136d381b289a3d55e811313abccc
2014-12-16 12:45:49 -08:00
Elliott Hughes
894724be30
Rewrite selectReadable JNI in Java.
...
Bug: 18719692
Change-Id: Id4fa95a31f112c720f7a3ac47a3b6c95c3028438
2014-12-16 10:00:33 -08:00
Tim Murray
d11a658db1
Fix typo with register native allocation.
...
bug 18579193
Change-Id: I42d30709b79a37d6a4126559a511e98e9c8d4808
2014-12-16 09:59:09 -08:00
Narayan Kamath
78108a3e52
Move frameworks users over to libcore hex encoding API.
...
Removes dependency on apache-http.
bug: 18027885
Change-Id: I508db016747985ecdd68e02d5d4efcd0ddd694df
2014-12-16 17:25:07 +00:00
mark_chen
89764e337b
[ActivityManager] Use synchronized to protect object
...
Symptom: ArrayIndexOutOfBoundsException at mResourcePackages
Root Cause: Race condition issue
Solution: Use synchronized to protect object
Change-Id: Ia2d89d50919d95d95f6f8ac2eb75594a93e8f2da
2014-12-16 05:44:34 +00:00
Christopher Tate
15626d3a49
am b32a33ce: Merge "Turn debug flag off"
...
* commit 'b32a33cec1bf54ba3fc243c1fbab59a98506c0ef':
Turn debug flag off
2014-12-16 03:03:11 +00:00
Christopher Tate
b32a33cec1
Merge "Turn debug flag off"
2014-12-16 02:53:13 +00:00
Elliott Hughes
2a6426c900
am e9e1e0d2: Merge "Reimplement reopenStdio in Java."
...
* commit 'e9e1e0d20f1f7bae11f5df74d14c7b1be4edc8ac':
Reimplement reopenStdio in Java.
2014-12-15 19:30:56 +00:00
Elliott Hughes
e9e1e0d20f
Merge "Reimplement reopenStdio in Java."
2014-12-15 19:24:53 +00:00
Elliott Hughes
dac83f5e6a
Reimplement reopenStdio in Java.
...
Bug: 18719692
Change-Id: I4ed984cd6148c5cba75d46a60f32a0687a5bcac3
2014-12-15 11:00:25 -08:00
Alan Jeon
f0e32ee572
Turn debug flag off
...
Change-Id: Iced1a24ecfc182eccedd3a749fab9dd32dea41da
Signed-off-by: Alan Jeon <skyisle@gmail.com>
2014-12-13 22:44:53 +09:00
Tim Murray
42d33aa635
am 3d00fdf4: Merge "Enable native tracking for RS contexts to improve GC behavior."
...
* commit '3d00fdf4cbe9f8fe8363f4ad4fa6c98ae03573ac':
Enable native tracking for RS contexts to improve GC behavior.
2014-12-13 00:09:38 +00:00
Tim Murray
3d00fdf4cb
Merge "Enable native tracking for RS contexts to improve GC behavior."
2014-12-13 00:02:31 +00:00
Elliott Hughes
20c906a8d4
am a101befb: Merge "Lose some unnecessary JNI from the zygote."
...
* commit 'a101befbef6a07af0746e3dbcd646d2b69a23492':
Lose some unnecessary JNI from the zygote.
2014-12-12 23:24:37 +00:00
Elliott Hughes
a101befbef
Merge "Lose some unnecessary JNI from the zygote."
2014-12-12 23:18:48 +00:00
Christopher Tate
125579caa1
am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms"
...
* commit '012de64e2dade079979bfa6cdca323b36901a0e6':
Fix bugs regarding delay the dispatching of non-wakeup alarms
2014-12-12 22:37:47 +00:00
Christopher Tate
012de64e2d
Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms"
2014-12-12 22:11:16 +00:00
Elliott Hughes
3fe595108f
Lose some unnecessary JNI from the zygote.
...
Bug: 18719692
Change-Id: Ie2d50400f10f3c54cfbf94e54656f6d704eac267
2014-12-12 14:07:34 -08:00
Tim Murray
aefbd5f97c
Enable native tracking for RS contexts to improve GC behavior.
...
This should prevent apps from leaking RS contexts as easily.
bug 18579193
Change-Id: I2d943ce4443ce7cb90ebdd3dd37d338eda6df3a2
2014-12-12 11:34:48 -08:00
Olawale Ogunwale
0e954dccab
am bfb30244: Merge "[ActivityManager] Fix NPE when start activity"
...
* commit 'bfb30244fbd3c6ba9eb8308b6bbacc9f78e8b6ef':
[ActivityManager] Fix NPE when start activity
2014-12-12 13:57:06 +00:00
Olawale Ogunwale
bfb30244fb
Merge "[ActivityManager] Fix NPE when start activity"
2014-12-12 13:49:51 +00:00
minho.choo
649acab389
Fix bugs regarding delay the dispatching of non-wakeup alarms
...
checkAllowNonWakeupDelayLocked() method determines that delay the dispatching of non-wakeup alarms.
(there are no wakeup alarms and the screen is off, it can delay until the future.)
if there is any pending non-wakeup alarms, non-wakeup alarm delivery time is bigger than nowELAPSED.
but, checkAllowNonWakeupDelayLocked() returns false and non-wakeup alarm is not delay until future.
i think it is necessary to reverse the inequality symbol on "mNextNonWakeupDeliveryTime > nowELAPSED"
if it isn't, Could you let me know when we get ¡°stuck in a loop¡± in the comment of checkAllowNonWakeupDelayLocked () method?
Change-Id: I7e972064547f4d0a9b4175dbd4cf735b4837abfd
Signed-off-by: Minho Choo <minho.choo@lge.com>
2014-12-12 16:13:55 +09:00
Chih-hung Hsieh
b0dd6d3a8a
am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
...
* commit '4c23a0ec161891a1248b7aea67fbfd1d00bbd199':
Adjust format strings to work on both 32-bit and 64-bit builds
2014-12-11 20:54:56 +00:00
Chih-hung Hsieh
4c23a0ec16
Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
2014-12-11 20:49:30 +00:00
Narayan Kamath
bc59ca4bdb
am 31462128: Merge "Avoid tearing down process groups twice."
...
* commit '314621287801ba4c71467aad4702114eeb4d9951':
Avoid tearing down process groups twice.
2014-12-11 10:28:10 +00:00
Narayan Kamath
37da3f0d28
am 7bd28de5: Merge "Remove some crufty "core" tests."
...
* commit '7bd28de5781293b1b2b4224762bd909d097adbda':
Remove some crufty "core" tests.
2014-12-11 10:28:04 +00:00
Narayan Kamath
3146212878
Merge "Avoid tearing down process groups twice."
2014-12-11 09:15:06 +00:00
Narayan Kamath
7bd28de578
Merge "Remove some crufty "core" tests."
2014-12-11 09:14:15 +00:00