OSDN Git Service
Nick Chalko [Mon, 8 Dec 2014 19:11:45 +0000 (19:11 +0000)]
am
4d1e20a2: am
f90b2e5d: Merge "docs: Fix typo, use --> user" into lmp-mr1-dev
* commit '
4d1e20a24765711c2767cbab0a7077ca538c838e':
docs: Fix typo, use --> user
Chet Haase [Mon, 8 Dec 2014 19:11:33 +0000 (19:11 +0000)]
am
b29c6299: am
0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev
* commit '
b29c6299704ffd3885be6347bf85058010e24868':
Fix seeking behavior
Joe Fernandez [Mon, 8 Dec 2014 19:10:07 +0000 (19:10 +0000)]
am
f6b890e4: am
ac76a16d: am
ae80fd42: am
f5aa6752: am
709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs
* commit '
f6b890e448e369c506c0ed57a336ce3f6429b940':
docs: Fixes for App Indexing training class
Luan Nguyen [Mon, 8 Dec 2014 19:09:59 +0000 (19:09 +0000)]
am
37579034: am
fded024a: am
0e597e92: am
9b5de582: am
daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs
* commit '
37579034a14d6442f0765e45b571a20dbcdcb83e':
docs: Update MessageAPI notes to mention the unreliable transmission nature.
smain@google.com [Mon, 8 Dec 2014 19:09:53 +0000 (19:09 +0000)]
am
a0ce7116: am
4de95d71: am
cc10c02b: am
6c59abc9: am
9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs
* commit '
a0ce71166198a6ebf337b7e2439a3db79b7d9ad6':
update L Preview message and disallow crawling /preview
Zhentao Sun [Mon, 8 Dec 2014 19:09:36 +0000 (19:09 +0000)]
am
4f04cb20: am
8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev
* commit '
4f04cb20cc37d7a70c2a50af97cc6fd6d064bb06':
Fixed a leak in GeofenceHardwareImpl.java.
Raph Levien [Mon, 8 Dec 2014 19:09:18 +0000 (19:09 +0000)]
am
8de4fb2f: am
2f0e6f0c: Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev
* commit '
8de4fb2fe53ed7707500d9cdf737953bed3dec7e':
Fix off-by-one error in computeEllipsis
Jason Monk [Mon, 8 Dec 2014 19:09:10 +0000 (19:09 +0000)]
am
85d61aaa: am
d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev
* commit '
85d61aaa1a441efd1c1eba2e30742552fa34a0d6':
Make CarrierText handle multi-sim
Alan Viverette [Fri, 5 Dec 2014 21:41:10 +0000 (21:41 +0000)]
am
ae656af7: am
bab2b594: Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev
* commit '
ae656af727966df132d5ec7a462bc8bd98e41b71':
Update locally cached drawables when constant state changes
Wale Ogunwale [Fri, 5 Dec 2014 21:41:03 +0000 (21:41 +0000)]
am
9a3f6ac6: am
6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev
* commit '
9a3f6ac63c9c11008b6dbb99d5213b3d3f51fca0':
Add support from restoring recent's backup.
Craig Mautner [Fri, 5 Dec 2014 21:40:55 +0000 (21:40 +0000)]
am
3f11bba5: am
afca4dba: Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev
* commit '
3f11bba5b90b9b0098f23f08a97e3dfc1421db33':
bug fix possible NPE while startProcessLocked()
Craig Mautner [Fri, 5 Dec 2014 21:40:49 +0000 (21:40 +0000)]
am
b97b19f6: am
9052862e: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" into lmp-mr1-dev
* commit '
b97b19f6a46fe3388373f2215446363e64e799c1':
[ActivityManager] Invalidate last screenshot when activity relaunched
Craig Mautner [Fri, 5 Dec 2014 21:40:43 +0000 (21:40 +0000)]
am
f6d03f39: am
799cb730: Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev
* commit '
f6d03f398098bdff74bcc7442fbc1912536a33e2':
[ActivityManager] Fix race condition in pss collection
Craig Mautner [Fri, 5 Dec 2014 21:40:37 +0000 (21:40 +0000)]
am
a32933fd: am
e0dc40c0: Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev
* commit '
a32933fdfe5909de63b938b65ec0d74297d0800d':
ANR caused by incorrect cleanup in BroadcastQueue.
Craig Mautner [Fri, 5 Dec 2014 21:40:32 +0000 (21:40 +0000)]
am
95cce9d5: am
93d47b4c: Merge "Avoid system server crash due to package removed" into lmp-mr1-dev
* commit '
95cce9d57e627a86f612bf402b3338a6a1a1eae3':
Avoid system server crash due to package removed
Craig Mautner [Fri, 5 Dec 2014 21:40:26 +0000 (21:40 +0000)]
am
435496e1: am
c2cae50b: Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev
* commit '
435496e1ac4d3e9d1381619ae54f6812c6a8ed0d':
Reset killedByAm flag at attachApplicationLocked
Craig Mautner [Fri, 5 Dec 2014 21:40:21 +0000 (21:40 +0000)]
am
1d8b27bc: am
1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev
* commit '
1d8b27bceddcd2ff26bc0f2b8d7a5f7a54604b06':
[ActivityManager] Fix NPE when start activity
David Friedman [Fri, 5 Dec 2014 20:19:43 +0000 (20:19 +0000)]
am
753f4fc9: am
9c28ba76: am
47eddc7c: am
bf6a4bfb: am
6e043e0c: Merge "Change notes for NDK r10d, to publish to DAC" into lmp-docs
* commit '
753f4fc95135a396ac9d7f6f4e3f9eacb662bb1d':
Change notes for NDK r10d, to publish to DAC
Geoff Mendal [Fri, 5 Dec 2014 20:19:37 +0000 (20:19 +0000)]
am
135a5761: (-s ours) am
597a7531: (-s ours) am
9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
135a5761857f9dbd31ab51abe6466e26ddb379cd':
Import translations. DO NOT MERGE
David Friedman [Fri, 5 Dec 2014 20:19:30 +0000 (20:19 +0000)]
am
29b04001: am
17904f8b: am
2d2e7bf3: am
ed839a76: am
795db65e: Merge "Fixes a typo, in which the word "give" is repeated. Bug
18553334" into lmp-docs
* commit '
29b040019226d7d02a57fe76a471465d16109f0b':
Fixes a typo, in which the word "give" is repeated. Bug
18553334
Svetoslav [Fri, 5 Dec 2014 20:19:24 +0000 (20:19 +0000)]
am
8d9a06fe: am
6e7bf935: Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev
* commit '
8d9a06feee0d5311e40adbccb0d2205a531def85':
Notify accessibility for window changes after an app animation end.
Justin Harrison [Fri, 5 Dec 2014 20:19:10 +0000 (20:19 +0000)]
am
2b236ab3: am
70941f20: Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev
* commit '
2b236ab30e479d22c0619670a97c90993307a190':
Revert "Revert "Improve fling physics for recents""
Craig Mautner [Fri, 5 Dec 2014 20:18:58 +0000 (20:18 +0000)]
am
8432cee0: am
224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev
* commit '
8432cee04f2ec4bf77a3ba84524148b78db7ea57':
Prevent ANR when broadcast receiver is killed
Paul Jensen [Fri, 5 Dec 2014 20:18:45 +0000 (20:18 +0000)]
am
461e7367: am
efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
* commit '
461e73677d208e4e97356cbc781ce490b90e2027':
Remember to cancel lingering when a network again satsifies a NetworkRequest.
Prerepa Viswanadham [Fri, 5 Dec 2014 20:18:38 +0000 (20:18 +0000)]
am
e21aafab: am
ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user
* commit '
e21aafab0d735935155860bd16dcc3ece81ce546':
Fix BT crash due to unset value for BluetoothGattDescriptor from API user
Adam Powell [Fri, 5 Dec 2014 19:39:25 +0000 (19:39 +0000)]
am
b3b4f837: am
8c9283f4: Merge "Fix NullPointerException in ListView"
* commit '
b3b4f83702ca878854529acfdc389d15db5ca6f3':
Fix NullPointerException in ListView
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"
Adam Lesinski [Fri, 5 Dec 2014 19:06:21 +0000 (11:06 -0800)]
Merge commit '
0953ab27' into manualmerge
Change-Id: I36dea45f7571096136ea7bda5e2680bd85a0df32
Christoph Studer [Fri, 5 Dec 2014 15:52:00 +0000 (15:52 +0000)]
am
3bf7b80e: am
391232da: Merge "Log the state of the notification shade" into lmp-mr1-dev
* commit '
3bf7b80e48eb58254a076f5363f1e9e3348abb8c':
Log the state of the notification shade
Christoph Studer [Fri, 5 Dec 2014 15:51:54 +0000 (15:51 +0000)]
am
2d58c922: am
798c0552: Merge "NoMan: Update effect suppressor on listener remove" into lmp-mr1-dev
* commit '
2d58c9220cdeaac63ae1a5c9f1c80c3e131ae296':
NoMan: Update effect suppressor on listener remove
Chris Wren [Fri, 5 Dec 2014 15:51:48 +0000 (15:51 +0000)]
am
f55ad284: am
ffc050ad: Merge "Track active notifications by key, not by reference." into lmp-mr1-dev
* commit '
f55ad284448d226b047815715bb10e193c88ae0d':
Track active notifications by key, not by reference.
RoboErik [Fri, 5 Dec 2014 15:51:39 +0000 (15:51 +0000)]
am
8f095396: am
7fbcac6a: Merge "Tweak the behavior of the MediaSessionStack" into lmp-mr1-dev
* commit '
8f0953963d91a22021676cc29b0f572c1a913124':
Tweak the behavior of the MediaSessionStack
Justin Harrison [Fri, 5 Dec 2014 15:51:33 +0000 (15:51 +0000)]
am
fdb33a08: am
21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev
* commit '
fdb33a08266d95c338c141446c1da09108194281':
Revert "Improve fling physics for recents"
Nick Chalko [Fri, 5 Dec 2014 00:07:58 +0000 (00:07 +0000)]
am
f90b2e5d: Merge "docs: Fix typo, use --> user" into lmp-mr1-dev
* commit '
f90b2e5d970564b15444d81a1881d3b7ef5f2b64':
docs: Fix typo, use --> user
Nick Chalko [Fri, 5 Dec 2014 00:00:21 +0000 (00:00 +0000)]
Merge "docs: Fix typo, use --> user" into lmp-mr1-dev
Chet Haase [Thu, 4 Dec 2014 23:35:37 +0000 (23:35 +0000)]
am
0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev
* commit '
0a77897bb6671220fe9d53964ccd2651216dc7ba':
Fix seeking behavior
Chet Haase [Thu, 4 Dec 2014 23:26:58 +0000 (23:26 +0000)]
Merge "Fix seeking behavior" into lmp-mr1-dev
Amith Yamasani [Thu, 4 Dec 2014 23:24:31 +0000 (23:24 +0000)]
am
66cbec51: am
d234dc1f: Merge "Correct check of is user running"
* commit '
66cbec512cf31228f8d86171f57cf4e3bcbbd63e':
Correct check of is user running
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
Joe Fernandez [Thu, 4 Dec 2014 23:13:46 +0000 (23:13 +0000)]
am
ac76a16d: am
ae80fd42: am
f5aa6752: am
709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs
* commit '
ac76a16dfc5b6442520fa03dc9a7c473550c4576':
docs: Fixes for App Indexing training class
Luan Nguyen [Thu, 4 Dec 2014 23:13:41 +0000 (23:13 +0000)]
am
fded024a: am
0e597e92: am
9b5de582: am
daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs
* commit '
fded024ab7227866b79018d2e4fd789f42d4b64b':
docs: Update MessageAPI notes to mention the unreliable transmission nature.
smain@google.com [Thu, 4 Dec 2014 23:13:36 +0000 (23:13 +0000)]
am
4de95d71: am
cc10c02b: am
6c59abc9: am
9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs
* commit '
4de95d71ec6eff0c9cbd303c083abf3431294a1c':
update L Preview message and disallow crawling /preview
Amith Yamasani [Thu, 4 Dec 2014 23:09:46 +0000 (23:09 +0000)]
Merge "Correct check of is user running"
Chet Haase [Wed, 3 Dec 2014 01:51:34 +0000 (17:51 -0800)]
Fix seeking behavior
A recent fix to seeking behavior injected a couple of issues that need
to be addressed:
- the start time should be updated when seeking so that future calculations
that depend on it (such as the next animation frame) will use the updated
start time based on this seek request. This allows, for example, seeking
into a running animator so that that animator will update its current fraction
to the new seeked value.
- calling reverse() on an unstarted animation would incorrectly set the initial
frame of the animation to the end value for one frame before the reverse animation
actually began.
Issue #
18567716 No icons in folders in battery saving mode
Issue #
18511989 Search bar flashes when icon is picked up and dropped
Change-Id: Ie30b7e797468c6ccb3d17d4fb3aba6b9849436b0
Joe Fernandez [Thu, 4 Dec 2014 23:07:04 +0000 (23:07 +0000)]
am
ae80fd42: am
f5aa6752: am
709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs
* commit '
ae80fd42a4371e28f6d89dc0f480f35da9dc57ce':
docs: Fixes for App Indexing training class
Luan Nguyen [Thu, 4 Dec 2014 23:06:53 +0000 (23:06 +0000)]
am
0e597e92: am
9b5de582: am
daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs
* commit '
0e597e922464545e6257027f71b575bd73adf4f4':
docs: Update MessageAPI notes to mention the unreliable transmission nature.
smain@google.com [Thu, 4 Dec 2014 23:05:47 +0000 (23:05 +0000)]
am
cc10c02b: am
6c59abc9: am
9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs
* commit '
cc10c02b10ce6d0be223c4409cb6aab98c5b8858':
update L Preview message and disallow crawling /preview
Zhentao Sun [Thu, 4 Dec 2014 22:58:02 +0000 (22:58 +0000)]
am
8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev
* commit '
8485098fa22a61f845cb2abbc5bc856b15835a9e':
Fixed a leak in GeofenceHardwareImpl.java.
Zhentao Sun [Thu, 4 Dec 2014 22:52:49 +0000 (22:52 +0000)]
Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev
Mike Lockwood [Thu, 4 Dec 2014 22:45:07 +0000 (22:45 +0000)]
am
75b25577: am
448403b7: Merge "Dont call close in in BluetoothA2dp finalize"
* commit '
75b2557725430e768cc3b21bb9c2aef92b887538':
Dont call close in in BluetoothA2dp finalize
Raph Levien [Thu, 4 Dec 2014 22:39:04 +0000 (22:39 +0000)]
am
2f0e6f0c: Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev
* commit '
2f0e6f0c7f52427ff542ebb9a28aa489a0f1f909':
Fix off-by-one error in computeEllipsis
Jason Monk [Thu, 4 Dec 2014 22:38:58 +0000 (22:38 +0000)]
am
d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev
* commit '
d601c6c5c38fcbf66ab1cca83fcd2e100ea019aa':
Make CarrierText handle multi-sim
Raph Levien [Thu, 4 Dec 2014 22:33:07 +0000 (22:33 +0000)]
Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev
Raph Levien [Thu, 4 Dec 2014 21:26:07 +0000 (13:26 -0800)]
Fix off-by-one error in computeEllipsis
In the Truncate.MIDDLE case, when the line is less than half the layout
width, the computeEllipsis logic could go past the left edge of the
string. This patch fixes the off-by-one and avoids the resulting index
out of bounds crash, and also changes the behavior so that when
ellipsizing at the middle, the string to the end of the paragraph is
taken into account.
Bug:
18508627
Change-Id: I24be09c23a5aa158791a9717419307613b8a22e8
Jason Monk [Thu, 4 Dec 2014 22:31:56 +0000 (22:31 +0000)]
Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev
Jason Monk [Tue, 2 Dec 2014 21:43:17 +0000 (16:43 -0500)]
Make CarrierText handle multi-sim
To do this need to handle the subscription id that comes with all
spn broadcasts and concatenate properly as needed.
Bug:
18223317
Change-Id: I2a1cde0a4bf2f50082288cc5cdeb968fa9aa7dd0
Nick Chalko [Thu, 4 Dec 2014 22:05:30 +0000 (14:05 -0800)]
docs: Fix typo, use --> user
Change-Id: Idfadf09b6c1711f6294e155176a2a713f8a8f616
Alan Viverette [Thu, 4 Dec 2014 22:07:06 +0000 (22:07 +0000)]
am
bab2b594: Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev
* commit '
bab2b5948a6d28f3bbe4981f2b6f172de292d456':
Update locally cached drawables when constant state changes
Wale Ogunwale [Thu, 4 Dec 2014 22:06:56 +0000 (22:06 +0000)]
am
6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev
* commit '
6b54d38a2c859f1c2cc176d1d9a33837cfc351db':
Add support from restoring recent's backup.
Alan Viverette [Thu, 4 Dec 2014 21:59:40 +0000 (21:59 +0000)]
Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev
Wale Ogunwale [Thu, 4 Dec 2014 21:58:49 +0000 (21:58 +0000)]
Merge "Add support from restoring recent's backup." into lmp-mr1-dev
Craig Mautner [Thu, 4 Dec 2014 21:58:29 +0000 (21:58 +0000)]
am
afca4dba: Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev
* commit '
afca4dba31f2da85265b97ad50638fc34bad292c':
bug fix possible NPE while startProcessLocked()
Craig Mautner [Thu, 4 Dec 2014 21:58:24 +0000 (21:58 +0000)]
am
9052862e: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" into lmp-mr1-dev
* commit '
9052862ebb64a0fdccc897d634eab20a1ad6debe':
[ActivityManager] Invalidate last screenshot when activity relaunched
Craig Mautner [Thu, 4 Dec 2014 21:58:18 +0000 (21:58 +0000)]
am
799cb730: Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev
* commit '
799cb730298591a9d7303ea051451a3b6dc8e51f':
[ActivityManager] Fix race condition in pss collection
Craig Mautner [Thu, 4 Dec 2014 21:58:13 +0000 (21:58 +0000)]
am
e0dc40c0: Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev
* commit '
e0dc40c0f232ee2d7c5523f307781ccd3f7cb50b':
ANR caused by incorrect cleanup in BroadcastQueue.
Craig Mautner [Thu, 4 Dec 2014 21:58:07 +0000 (21:58 +0000)]
am
93d47b4c: Merge "Avoid system server crash due to package removed" into lmp-mr1-dev
* commit '
93d47b4c05585c37117ac5ac44d810de63f9d008':
Avoid system server crash due to package removed
Craig Mautner [Thu, 4 Dec 2014 21:54:52 +0000 (21:54 +0000)]
Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev
Craig Mautner [Thu, 4 Dec 2014 21:53:38 +0000 (21:53 +0000)]
Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" into lmp-mr1-dev
Craig Mautner [Thu, 4 Dec 2014 21:51:55 +0000 (21:51 +0000)]
Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev
Craig Mautner [Thu, 4 Dec 2014 21:50:45 +0000 (21:50 +0000)]
Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev
Craig Mautner [Thu, 4 Dec 2014 21:50:14 +0000 (21:50 +0000)]
Merge "Avoid system server crash due to package removed" into lmp-mr1-dev
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
Craig Mautner [Thu, 4 Dec 2014 21:49:50 +0000 (21:49 +0000)]
am
c2cae50b: Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev
* commit '
c2cae50b832753dea612db575c6d97b8d94eceea':
Reset killedByAm flag at attachApplicationLocked
Craig Mautner [Thu, 4 Dec 2014 21:49:44 +0000 (21:49 +0000)]
am
1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev
* commit '
1289a3b2d3ae6ba67215d984c3302bfdcd69ae14':
[ActivityManager] Fix NPE when start activity
Jorim Jaggi [Thu, 4 Dec 2014 21:47:35 +0000 (21:47 +0000)]
am
9f44ea8f: am
54daab10: Merge "Improve fling physics for recents" into lmp-mr1-dev
* commit '
9f44ea8fbcee80816f4ce6eeca2568ccd06d5a15':
Improve fling physics for recents
Jorim Jaggi [Thu, 4 Dec 2014 21:47:28 +0000 (21:47 +0000)]
am
d3cf181d: am
47faf69c: Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev
* commit '
d3cf181d57bb7d63ea8dc6834daf8e3c84f1c769':
Fix rounded corners in bottom QS panel.
Derek Sollenberger [Thu, 4 Dec 2014 21:46:39 +0000 (21:46 +0000)]
am
c1a2f38c: am
4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
* commit '
c1a2f38ce0447b005d0cde6836857f451af84dc6':
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
Christoph Studer [Thu, 4 Dec 2014 21:46:32 +0000 (21:46 +0000)]
am
a6ecb61e: am
c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev
* commit '
a6ecb61ee7a87af7153f11289d7df1eb6f1beb67':
RankingHelper: Remove STOPSHIP
Deepanshu Gupta [Thu, 4 Dec 2014 21:46:26 +0000 (21:46 +0000)]
am
43d0e675: am
7e168ad0: am
6cbef4bd: am
03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev
* commit '
43d0e67573e8122d9e75accb00eaa453e2755713':
Ensure that RandomAccessFile is not leaked.
Deepanshu Gupta [Thu, 4 Dec 2014 21:46:20 +0000 (21:46 +0000)]
am
52a60ff6: am
302a7cc1: am
4628d51a: am
141c7614: Merge "Fix AnalogClock rendering" into lmp-dev
* commit '
52a60ff6366a4f5cf1ed9697b7cebd6f9300de2b':
Fix AnalogClock rendering
Deepanshu Gupta [Thu, 4 Dec 2014 21:46:14 +0000 (21:46 +0000)]
am
c16d1448: am
b2ded18a: Merge "resolved conflicts for merge of
fb30a783 to lmp-mr1-dev" into lmp-mr1-dev
* commit '
c16d1448bb139384cc86d14d9412ffe1a62817c8':
Fix typos in previous bugfixes.
Jinsuk Kim [Thu, 4 Dec 2014 21:46:08 +0000 (21:46 +0000)]
am
92a46272: am
f1647395: Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev
* commit '
92a4627250d74264719eff3ade798a9f4480ed5a':
CEC: Generate hotplug events upon adding listener
Vinit Deshpande [Thu, 4 Dec 2014 21:46:01 +0000 (21:46 +0000)]
am
aefb79b2: am
31bd4220: Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev
* commit '
aefb79b2dd13047630ba455d5a3aec8084c1d954':
Remove notification for SoftAP turned on
Geoff Mendal [Thu, 4 Dec 2014 21:45:55 +0000 (21:45 +0000)]
am
c7d8a48b: (-s ours) am
cc7c68b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
c7d8a48bb01f3d6ffbf6a3f8f81e23dd0b806562':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 4 Dec 2014 21:45:48 +0000 (21:45 +0000)]
am
c7b52575: (-s ours) am
a821e77d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
c7b52575212ca00f7c52222f1129a0f64e061095':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 4 Dec 2014 21:45:42 +0000 (21:45 +0000)]
am
5d1f6880: (-s ours) am
72a20419: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
5d1f68803488677637b1f383d0f1162a896a9684':
Import translations. DO NOT MERGE
Erik Kline [Thu, 4 Dec 2014 21:45:33 +0000 (21:45 +0000)]
am
95b5ca90: am
9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
* commit '
95b5ca9019720c4c012ca13791d32aa6d0bb5ba8':
Remove CONNECTIVITY_CHANGE_DELAY and friends.
John Spurlock [Thu, 4 Dec 2014 21:45:26 +0000 (21:45 +0000)]
am
95931270: am
32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev
* commit '
959312701f55c9d098403c332b88b5777daf4e4c':
Doze: Don't block pickup pulses on a proximity check.
Craig Mautner [Thu, 4 Dec 2014 21:45:19 +0000 (21:45 +0000)]
Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev
Pavel Zhamaitsiak [Thu, 4 Dec 2014 21:45:21 +0000 (21:45 +0000)]
am
38916819: am
1fb69936: Merge "IMS Call End Cause Additions" into lmp-mr1-dev
* commit '
38916819693a69fbc882ac509e60ef0b6419c5dc':
IMS Call End Cause Additions
duho.ro [Thu, 4 Dec 2014 21:45:14 +0000 (21:45 +0000)]
am
36ccf75b: am
fb754252: UICC : discard language setting of SIM
* commit '
36ccf75bb26604786f1d99ab1703ba01f8c3290c':
UICC : discard language setting of SIM
Cheuksan Wang [Thu, 4 Dec 2014 21:45:08 +0000 (21:45 +0000)]
am
dba26aa2: am
109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
* commit '
dba26aa2e793b037839c608319534b100d2c3dbe':
new SMS/MMS carrier app API
Craig Mautner [Thu, 4 Dec 2014 21:44:33 +0000 (21:44 +0000)]
Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev
Mike Lockwood [Thu, 4 Dec 2014 21:41:12 +0000 (21:41 +0000)]
Merge "Dont call close in in BluetoothA2dp finalize"
John Reck [Thu, 4 Dec 2014 21:41:04 +0000 (13:41 -0800)]
resolved conflicts for merge of
a51a0901 to lmp-mr1-dev-plus-aosp
Change-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed
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
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
Kazuki Nakayama [Thu, 29 May 2014 07:05:34 +0000 (16:05 +0900)]
Reset killedByAm flag at attachApplicationLocked
Cherry picked from aosp.
Fixes bug
18593309.
ActivityManager reuses a process record object that killed
by him under some situation. That reused process record inherits
a killedByAm flag unexpectedly.
The killedByAm flag must be reset otherwise ActivityManager can't
judge the process can be killed or not.
Change-Id: If95137d91939cc44882ad2813131bcde0edd0c1b
OSDN Git Service
