OSDN Git Service
Elliott Hughes [Wed, 17 Dec 2014 18:26:33 +0000 (18:26 +0000)]
am
e6d63b94: Merge "Rewrite selectReadable JNI in Java."
* commit '
e6d63b94627d0072ff1468feca71698df1a0b64e':
Rewrite selectReadable JNI in Java.
Elliott Hughes [Wed, 17 Dec 2014 18:21:06 +0000 (18:21 +0000)]
Merge "Rewrite selectReadable JNI in Java."
Narayan Kamath [Wed, 17 Dec 2014 13:39:32 +0000 (13:39 +0000)]
am
6d41504d: Merge "Move frameworks users over to libcore hex encoding API."
* commit '
6d41504d2c2111a55a4c06dd6b183318efd7c598':
Move frameworks users over to libcore hex encoding API.
Narayan Kamath [Wed, 17 Dec 2014 13:33:59 +0000 (13:33 +0000)]
Merge "Move frameworks users over to libcore hex encoding API."
Tim Murray [Tue, 16 Dec 2014 21:36:43 +0000 (21:36 +0000)]
am
8de16999: Merge "Fix typo with register native allocation."
* commit '
8de169993f0078bfdd064499c48b9d124cb438be':
Fix typo with register native allocation.
Tim Murray [Tue, 16 Dec 2014 21:30:57 +0000 (21:30 +0000)]
Merge "Fix typo with register native allocation."
Ying Wang [Tue, 16 Dec 2014 20:50:58 +0000 (20:50 +0000)]
am
c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '
c80c12dda9c1ce11affdccb2923b2e570daacfcd':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Ying Wang [Tue, 16 Dec 2014 20:46:17 +0000 (20:46 +0000)]
Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
Ying Wang [Tue, 16 Dec 2014 20:43:40 +0000 (12:43 -0800)]
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Bug:
18675947
Change-Id: If4909c5f8495136d381b289a3d55e811313abccc
Elliott Hughes [Mon, 15 Dec 2014 20:39:51 +0000 (12:39 -0800)]
Rewrite selectReadable JNI in Java.
Bug:
18719692
Change-Id: Id4fa95a31f112c720f7a3ac47a3b6c95c3028438
Tim Murray [Tue, 16 Dec 2014 17:59:09 +0000 (09:59 -0800)]
Fix typo with register native allocation.
bug
18579193
Change-Id: I42d30709b79a37d6a4126559a511e98e9c8d4808
Narayan Kamath [Tue, 16 Dec 2014 12:56:23 +0000 (12:56 +0000)]
Move frameworks users over to libcore hex encoding API.
Removes dependency on apache-http.
bug:
18027885
Change-Id: I508db016747985ecdd68e02d5d4efcd0ddd694df
Christopher Tate [Tue, 16 Dec 2014 03:03:11 +0000 (03:03 +0000)]
am
b32a33ce: Merge "Turn debug flag off"
* commit '
b32a33cec1bf54ba3fc243c1fbab59a98506c0ef':
Turn debug flag off
Christopher Tate [Tue, 16 Dec 2014 02:53:13 +0000 (02:53 +0000)]
Merge "Turn debug flag off"
Elliott Hughes [Mon, 15 Dec 2014 19:30:56 +0000 (19:30 +0000)]
am
e9e1e0d2: Merge "Reimplement reopenStdio in Java."
* commit '
e9e1e0d20f1f7bae11f5df74d14c7b1be4edc8ac':
Reimplement reopenStdio in Java.
Elliott Hughes [Mon, 15 Dec 2014 19:24:52 +0000 (19:24 +0000)]
Merge "Reimplement reopenStdio in Java."
Elliott Hughes [Mon, 15 Dec 2014 19:00:25 +0000 (11:00 -0800)]
Reimplement reopenStdio in Java.
Bug:
18719692
Change-Id: I4ed984cd6148c5cba75d46a60f32a0687a5bcac3
Alan Jeon [Sat, 13 Dec 2014 13:44:53 +0000 (22:44 +0900)]
Turn debug flag off
Change-Id: Iced1a24ecfc182eccedd3a749fab9dd32dea41da
Signed-off-by: Alan Jeon <skyisle@gmail.com>
Tim Murray [Sat, 13 Dec 2014 00:09:38 +0000 (00:09 +0000)]
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.
Tim Murray [Sat, 13 Dec 2014 00:02:30 +0000 (00:02 +0000)]
Merge "Enable native tracking for RS contexts to improve GC behavior."
Elliott Hughes [Fri, 12 Dec 2014 23:24:37 +0000 (23:24 +0000)]
am
a101befb: Merge "Lose some unnecessary JNI from the zygote."
* commit '
a101befbef6a07af0746e3dbcd646d2b69a23492':
Lose some unnecessary JNI from the zygote.
Elliott Hughes [Fri, 12 Dec 2014 23:18:48 +0000 (23:18 +0000)]
Merge "Lose some unnecessary JNI from the zygote."
Christopher Tate [Fri, 12 Dec 2014 22:37:47 +0000 (22:37 +0000)]
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
Christopher Tate [Fri, 12 Dec 2014 22:11:15 +0000 (22:11 +0000)]
Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms"
Elliott Hughes [Fri, 12 Dec 2014 22:07:34 +0000 (14:07 -0800)]
Lose some unnecessary JNI from the zygote.
Bug:
18719692
Change-Id: Ie2d50400f10f3c54cfbf94e54656f6d704eac267
Tim Murray [Fri, 12 Dec 2014 19:34:48 +0000 (11:34 -0800)]
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
Olawale Ogunwale [Fri, 12 Dec 2014 13:57:06 +0000 (13:57 +0000)]
am
bfb30244: Merge "[ActivityManager] Fix NPE when start activity"
* commit '
bfb30244fbd3c6ba9eb8308b6bbacc9f78e8b6ef':
[ActivityManager] Fix NPE when start activity
Olawale Ogunwale [Fri, 12 Dec 2014 13:49:50 +0000 (13:49 +0000)]
Merge "[ActivityManager] Fix NPE when start activity"
minho.choo [Fri, 12 Dec 2014 07:13:55 +0000 (16:13 +0900)]
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>
Chih-hung Hsieh [Thu, 11 Dec 2014 20:54:56 +0000 (20:54 +0000)]
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
Chih-hung Hsieh [Thu, 11 Dec 2014 20:49:29 +0000 (20:49 +0000)]
Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
Narayan Kamath [Thu, 11 Dec 2014 10:28:10 +0000 (10:28 +0000)]
am
31462128: Merge "Avoid tearing down process groups twice."
* commit '
314621287801ba4c71467aad4702114eeb4d9951':
Avoid tearing down process groups twice.
Narayan Kamath [Thu, 11 Dec 2014 10:28:04 +0000 (10:28 +0000)]
am
7bd28de5: Merge "Remove some crufty "core" tests."
* commit '
7bd28de5781293b1b2b4224762bd909d097adbda':
Remove some crufty "core" tests.
Narayan Kamath [Thu, 11 Dec 2014 09:15:05 +0000 (09:15 +0000)]
Merge "Avoid tearing down process groups twice."
Narayan Kamath [Thu, 11 Dec 2014 09:14:15 +0000 (09:14 +0000)]
Merge "Remove some crufty "core" tests."
Narayan Kamath [Wed, 10 Dec 2014 19:49:59 +0000 (19:49 +0000)]
Remove some crufty "core" tests.
nobody runs these, and these things are well tested elsewhere
and a part of CTS.
Change-Id: I1ec00f2a085fc82f902f538ace692ac989ca03df
Craig Mautner [Wed, 10 Dec 2014 17:57:34 +0000 (17:57 +0000)]
am
2de55513: Merge "Only one task within the stack should moveToBack"
* commit '
2de55513f81b238ea42b2b36cbf61e8c1a475c45':
Only one task within the stack should moveToBack
Craig Mautner [Wed, 10 Dec 2014 17:51:31 +0000 (17:51 +0000)]
Merge "Only one task within the stack should moveToBack"
Narayan Kamath [Wed, 10 Dec 2014 10:00:14 +0000 (10:00 +0000)]
Avoid tearing down process groups twice.
The second removal always triggers a warning.
Change-Id: Ieafa8374dbffdaff0d576de004a688cae6f8ac18
Craig Mautner [Tue, 9 Dec 2014 16:39:08 +0000 (16:39 +0000)]
am
f71f5e89: Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked."
* commit '
f71f5e8957aa2495a708ea1c8ca9e19d9e1f0003':
[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.
Craig Mautner [Tue, 9 Dec 2014 16:33:25 +0000 (16:33 +0000)]
Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked."
Elliott Hughes [Tue, 9 Dec 2014 16:11:01 +0000 (16:11 +0000)]
Elliott Hughes [Tue, 9 Dec 2014 16:02:56 +0000 (16:02 +0000)]
Merge "Fix typo."
Mark Lu [Tue, 9 Dec 2014 06:47:13 +0000 (14:47 +0800)]
[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.
Symptom:
in .ActivityStack.resetTargetTaskIfNeededLocked, "allowTaskReparenting" if case will call setTask
to remove activities from task, that will caused numActivities in main for-loop not consist with task.mActivities size.
caused NPE will happend in finish activities for-loop due to get null object from activities when clearWhenTaskReset" as true case.
Root Cause:
when clearWhenTaskReset as true, will set "end" variable as numActivities -1, but if calling setTask to remove activities from task,
end value will out of date & not same with task.mActivities size.
Solution:
use activities.size() - 1 to assign end value.
Change-Id: I5d7fe22e1df2fc61738db23402e7c42cf6d8c4cc
Elliott Hughes [Tue, 9 Dec 2014 04:47:11 +0000 (20:47 -0800)]
Fix typo.
Bug: https://code.google.com/p/android/issues/detail?id=78422
Change-Id: I0dfbb74334e126062660831a4e01817dde068b56
Mathieu Chartier [Tue, 9 Dec 2014 02:25:45 +0000 (02:25 +0000)]
am
fb5c932d: Merge "Add more -d dalvik details to dumpsys"
* commit '
fb5c932dbbe2e7fc3ed4f0af71dc8ac76f22df57':
Add more -d dalvik details to dumpsys
Mathieu Chartier [Tue, 9 Dec 2014 02:05:44 +0000 (02:05 +0000)]
Merge "Add more -d dalvik details to dumpsys"
Mathieu Chartier [Tue, 9 Dec 2014 00:20:26 +0000 (16:20 -0800)]
Add more -d dalvik details to dumpsys
Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).
Example:
Dalvik Details
.Heap 2264 2264 0 0
.LOS 80 80 0 0
.GC 144 144 0 0
.Zygote 331 196 0 2428
.NonMoving 540 540 0 0
.IndirectRef 20 20 0 0
Bug:
18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
(cherry picked from commit
25c5e2b12d5d5d06739e3f70a0da968d97935b46)
Dmitriy Ivanov [Tue, 9 Dec 2014 00:07:58 +0000 (00:07 +0000)]
am
f0070999: Merge "Remove unsed check for simulator"
* commit '
f00709991dd13311054b78782de483b53941bcf8':
Remove unsed check for simulator
Dmitriy Ivanov [Mon, 8 Dec 2014 21:17:59 +0000 (21:17 +0000)]
Merge "Remove unsed check for simulator"
Lajos Molnar [Mon, 8 Dec 2014 18:07:56 +0000 (18:07 +0000)]
am
9d6fa062: Merge "media: fix isSupportedFormat for integer frame rate"
* commit '
9d6fa062a55c17b7fa08707b1006e7295bf9bc0c':
media: fix isSupportedFormat for integer frame rate
Lajos Molnar [Mon, 8 Dec 2014 18:07:49 +0000 (18:07 +0000)]
am
38935e6e: Merge "media: allow full range of Vorbis sampling rates"
* commit '
38935e6eafc90d491e3a02e15ebb0890b7731473':
media: allow full range of Vorbis sampling rates
Lajos Molnar [Mon, 8 Dec 2014 18:02:40 +0000 (18:02 +0000)]
Merge "media: fix isSupportedFormat for integer frame rate"
Lajos Molnar [Mon, 8 Dec 2014 18:02:17 +0000 (18:02 +0000)]
Merge "media: allow full range of Vorbis sampling rates"
Narayan Kamath [Mon, 8 Dec 2014 13:43:15 +0000 (13:43 +0000)]
am
bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc."
* commit '
bdc6cde725a6fdb1b6911c74f20a797df9672d7f':
Fix PhoneStateListener constructor javadoc.
Narayan Kamath [Mon, 8 Dec 2014 13:35:45 +0000 (13:35 +0000)]
Merge "Fix PhoneStateListener constructor javadoc."
Karol Wrótniak [Thu, 27 Nov 2014 20:29:15 +0000 (21:29 +0100)]
Fix PhoneStateListener constructor javadoc.
Removed sentence in visible javadoc of #PhoneStateListener() which
was useless because it referred to another hidden constructor.
Change-Id: I14a956ac29881000e48bf31e0090e9e1f93bf6e3
Bernhard Rosenkränzer [Sun, 30 Nov 2014 10:04:10 +0000 (11:04 +0100)]
Adjust format strings to work on both 32-bit and 64-bit builds
Adjust format strings to not produce Clang warnings in both 32-bit and
64-bit builds
Change-Id: I76c29d8d5d0fb4b5e9d9518077652370ffe9e871
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Dmitriy Ivanov [Fri, 5 Dec 2014 22:08:04 +0000 (14:08 -0800)]
Remove unsed check for simulator
Change-Id: I46f134d960db330e7b6e7dbfebc84d602d3a3466
Adam Powell [Fri, 5 Dec 2014 19:32:13 +0000 (19:32 +0000)]
am
8c9283f4: Merge "Fix NullPointerException in ListView"
* commit '
8c9283f41083a20a82ae37eac44b79de6eb3158e':
Fix NullPointerException in ListView
Adam Powell [Fri, 5 Dec 2014 19:26:16 +0000 (19:26 +0000)]
Merge "Fix NullPointerException in ListView"
Lajos Molnar [Fri, 21 Nov 2014 00:16:55 +0000 (16:16 -0800)]
media: fix isSupportedFormat for integer frame rate
Bug:
18473065
Change-Id: I670cc043d3cb117c26921cb639ff9eecc8f14b0a
Lajos Molnar [Thu, 4 Dec 2014 17:50:06 +0000 (09:50 -0800)]
media: allow full range of Vorbis sampling rates
Bug:
18615604
Change-Id: I51f0c5c81145b94626f2b7e4505b905b63a572bf
Amith Yamasani [Thu, 4 Dec 2014 23:15:47 +0000 (23:15 +0000)]
am
d234dc1f: Merge "Correct check of is user running"
* commit '
d234dc1f20d3a68e0dd9f2c3a5f14282fba79b13':
Correct check of is user running
Amith Yamasani [Thu, 4 Dec 2014 23:09:46 +0000 (23:09 +0000)]
Merge "Correct check of is user running"
Mike Lockwood [Thu, 4 Dec 2014 21:49:56 +0000 (21:49 +0000)]
am
448403b7: Merge "Dont call close in in BluetoothA2dp finalize"
* commit '
448403b7a4b2126e79121482d1fb2894133dfa25':
Dont call close in in BluetoothA2dp finalize
Mike Lockwood [Thu, 4 Dec 2014 21:41:12 +0000 (21:41 +0000)]
Merge "Dont call close in in BluetoothA2dp finalize"
Craig Mautner [Thu, 4 Dec 2014 15:16:11 +0000 (15:16 +0000)]
am
e879b2ae: Merge "Prevent ANR when broadcast receiver is killed"
* commit '
e879b2ae69bf7ef159dbdc068423526d5db99df0':
Prevent ANR when broadcast receiver is killed
Chih-hung Hsieh [Thu, 4 Dec 2014 15:16:04 +0000 (15:16 +0000)]
am
ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"
* commit '
ccce6e0f9f6f4da95d61fb2cfb1253ac662fba30':
Add -Wno-unused-parameter to LOCAL_CFLAGS
Craig Mautner [Thu, 4 Dec 2014 01:56:39 +0000 (01:56 +0000)]
Merge "Prevent ANR when broadcast receiver is killed"
Kenji Sugimoto [Thu, 17 Jul 2014 05:50:41 +0000 (14:50 +0900)]
Prevent ANR when broadcast receiver is killed
If the process of a BroacastReceiver is dying at the same time
as the system is trying to send an ordered broadcast to the
receiver, the system will try to start the process again. The
BroadcastQueue will store the BroadcastRecord in mPendingBroadcast
to be able to handle it again when the process is awake. A
timeout Message is posted to the handler of the BroadcastQueue.
As part of the shutdown sequence skipCurrentReceiver is called for
the ProcessRecord. This will check if there is a curReceiver set
for the application and make sure to finish the receiver.
Each of the foreground and background BroadcastQueues have their
own handler for managing broadcast timeouts. If the wrong
BroadcastQueue finishes the receiver, the pending timeout Message
will never be cancelled, leading to an ANR report for a receiver
that has already been finished.
Change-Id: I960c0d8f1a8b739b54a8f09f496b32a3498b9e9a
Chih-hung Hsieh [Thu, 4 Dec 2014 01:04:09 +0000 (01:04 +0000)]
Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"
Adam Lesinski [Wed, 3 Dec 2014 17:49:12 +0000 (17:49 +0000)]
am
a2b5067a: Merge "RRO: prevent duplicate system overlays"
* commit '
a2b5067aeef5b2d68a7a2f7b4edc7ee0908b5d5b':
RRO: prevent duplicate system overlays
Adam Lesinski [Wed, 3 Dec 2014 17:44:17 +0000 (17:44 +0000)]
Merge "RRO: prevent duplicate system overlays"
Sergii Skorokhodov [Tue, 11 Nov 2014 07:22:18 +0000 (08:22 +0100)]
Correct check of is user running
Before the ActivityManagerService sends an intent or
starts an activity it checks if target user is in
mStartedUsers array.
When removing a non-owner user process the
UserStartedState instance will still be in mStartedUsers
array with mState STOPPING or SHUTDOWN.
This should be checked before sending an intent or start
an activity.
isUserRunningLocked(...) will interpret mState STOPPING
and SHUTDOWN as a non running user.
Change-Id: I1b51bcdb62bdd0f6dbe05dab4d529d4ad40d0d44
Jason Sams [Tue, 2 Dec 2014 23:52:12 +0000 (23:52 +0000)]
am
abdaa32d: Merge "Fix bug in passing of context flags and version."
* commit '
abdaa32dd79c915d0e419560c8eaa64e3d946b77':
Fix bug in passing of context flags and version.
Jason Sams [Tue, 2 Dec 2014 23:45:16 +0000 (23:45 +0000)]
Merge "Fix bug in passing of context flags and version."
Adam Lesinski [Tue, 2 Dec 2014 23:00:06 +0000 (23:00 +0000)]
am
e89a2865: Merge changes If2c7e09f,Ie21f227c
* commit '
e89a286541e242ad96705fcdd1fe2c6a9eafb4a0':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets
Adam Lesinski [Tue, 2 Dec 2014 22:52:36 +0000 (22:52 +0000)]
Merge changes If2c7e09f,Ie21f227c
* changes:
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets
Chris Wren [Tue, 2 Dec 2014 22:38:28 +0000 (22:38 +0000)]
am
acd01ff0: Merge "Keep deleteIntent when copying Notification attributes"
* commit '
acd01ff07668a608cb4890a2ea1533a2397149c8':
Keep deleteIntent when copying Notification attributes
Chris Wren [Tue, 2 Dec 2014 22:31:06 +0000 (22:31 +0000)]
Merge "Keep deleteIntent when copying Notification attributes"
Jason Sams [Tue, 2 Dec 2014 20:36:43 +0000 (12:36 -0800)]
Fix bug in passing of context flags and version.
Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7
Alan Viverette [Tue, 2 Dec 2014 19:36:03 +0000 (19:36 +0000)]
am
71c5d62d: Merge "Consider RTL layout in DPAD navigation in AbsSeekBar"
* commit '
71c5d62d9680207c4d3d25ac3f590f3667b250eb':
Consider RTL layout in DPAD navigation in AbsSeekBar
Alan Viverette [Tue, 2 Dec 2014 19:21:21 +0000 (19:21 +0000)]
Merge "Consider RTL layout in DPAD navigation in AbsSeekBar"
Craig Mautner [Tue, 2 Dec 2014 19:05:01 +0000 (19:05 +0000)]
am
f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection"
* commit '
f6be7d177a740f86a4ae3b8685cc9e2f31506352':
[ActivityManager] Fix race condition in pss collection
Craig Mautner [Tue, 2 Dec 2014 18:57:34 +0000 (18:57 +0000)]
Merge "[ActivityManager] Fix race condition in pss collection"
Craig Mautner [Tue, 2 Dec 2014 18:03:46 +0000 (18:03 +0000)]
am
f54954f9: Merge "bug fix possible NPE while startProcessLocked()"
* commit '
f54954f97599f83584ab736d931b1fe1aff8890c':
bug fix possible NPE while startProcessLocked()
Craig Mautner [Tue, 2 Dec 2014 17:57:11 +0000 (17:57 +0000)]
Merge "bug fix possible NPE while startProcessLocked()"
Craig Mautner [Tue, 2 Dec 2014 17:56:09 +0000 (17:56 +0000)]
am
50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"
* commit '
50f513c56989337aa0a48304213dd1deee2a0ede':
[ActivityManager] Invalidate last screenshot when activity relaunched
Craig Mautner [Tue, 2 Dec 2014 17:50:30 +0000 (17:50 +0000)]
Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"
louis_chang [Tue, 2 Dec 2014 04:57:39 +0000 (12:57 +0800)]
[ActivityManager] Fix race condition in pss collection
Symptom:
There has a race condition that two threads are accessing
the mPendingPssProcesses simultaneously. One of the thread
is collecting the process pss by looping the mPendingPssProcesses.
The other thread is requesting to collect pss of all processes,
which clears mPendingPssProcesses and adding processes back.
Solution:
Avoid race condition by adding synchornized protection.
Change-Id: Ifb090eda9c4a1b8e3fd980fe0171e9dd77773b46
louis_chang [Tue, 2 Dec 2014 04:38:05 +0000 (12:38 +0800)]
[ActivityManager] Invalidate last screenshot when activity relaunched
Symptom:
The task thumbnail is not updated when activity relaunched.
Reproduce Steps:
1. Put device in portrait
2. Launch Calculator
3. Launch Recent App (the Calculator's screenshot is correct)
4. Rotate device to landscape
5. Click Calculator in Recent App to return to Calculator (Calculator has relaunched to landsacpe ui)
6. Launch Recent App again (the Calculator's screenshot is not updated)
Change-Id: I92e951ea2ee215c52ca6e50cf6f9e02deb787bce
younghwan1.kim [Tue, 2 Dec 2014 04:04:40 +0000 (13:04 +0900)]
bug fix possible NPE while startProcessLocked()
In case, process doesn't create well while startingProcessLocked().
There is possibility to make NPE.
Setting app's crash handler needs to be assigned after null check routine.
Change-Id: I67fb6427f72d93f79fed36eb44c47d37eafdac31
Jesse Hall [Tue, 2 Dec 2014 00:42:23 +0000 (00:42 +0000)]
am
1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
* commit '
1ee377764a59d0e2c245dd037006fa8c086f5683':
Avoid overwriting EGL14.EGL_NO_SURFACE
Jesse Hall [Tue, 2 Dec 2014 00:35:11 +0000 (00:35 +0000)]
Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
dcashman [Mon, 1 Dec 2014 23:54:11 +0000 (23:54 +0000)]
am
24d02652: Merge "Prevent EntropyMixer from registering with service manager."
* commit '
24d02652bf8df12a41acf500d958109ef3d99b9a':
Prevent EntropyMixer from registering with service manager.
Michael Wright [Mon, 1 Dec 2014 23:54:04 +0000 (23:54 +0000)]
am
c859b85c: Merge "Added Razer USA, Ltd serval"
* commit '
c859b85cb530e608da775bb18744a996483a0311':
Added Razer USA, Ltd serval
dcashman [Mon, 1 Dec 2014 23:49:25 +0000 (23:49 +0000)]
Merge "Prevent EntropyMixer from registering with service manager."
Michael Wright [Mon, 1 Dec 2014 23:47:37 +0000 (23:47 +0000)]
Merge "Added Razer USA, Ltd serval"
John Reck [Mon, 1 Dec 2014 21:35:40 +0000 (21:35 +0000)]
am
6afc5cf3: Merge "Prevent calling GL functions with an invalid surface"
* commit '
6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3':
Prevent calling GL functions with an invalid surface