OSDN Git Service
Wale Ogunwale [Wed, 21 Oct 2015 16:33:25 +0000 (16:33 +0000)]
Merge "Ensure state transition of paused activity." am:
c2b9c5388a
am:
11695e8081
* commit '
11695e8081b269d489b5b4cc0b0c2075baeebc9b':
Ensure state transition of paused activity.
Wale Ogunwale [Wed, 21 Oct 2015 16:08:51 +0000 (16:08 +0000)]
Merge "Ensure state transition of paused activity."
am:
c2b9c5388a
* commit '
c2b9c5388a4038ba260e2c36b7b8884cf4097c2e':
Ensure state transition of paused activity.
Wale Ogunwale [Wed, 21 Oct 2015 16:03:23 +0000 (16:03 +0000)]
Merge "Ensure state transition of paused activity."
Geoff Mendal [Wed, 21 Oct 2015 14:59:12 +0000 (14:59 +0000)]
Import translations. DO NOT MERGE am:
0705d75d69 -s ours
am:
c1fe7bdce5 -s ours
* commit '
c1fe7bdce5721ffe626881c4230e0a91288c834f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 14:49:01 +0000 (14:49 +0000)]
Import translations. DO NOT MERGE
am:
0705d75d69 -s ours
* commit '
0705d75d69e359edcdce9f6991eb52f8dcb421ed':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 12:14:07 +0000 (05:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idaba78408b31b9161ac35fbcf940266b491ee296
Auto-generated-cl: translation import
Lorenzo Colitti [Wed, 21 Oct 2015 02:19:15 +0000 (02:19 +0000)]
Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev am:
d214496319 am:
5c09f31e49
am:
18ec0b5187
* commit '
18ec0b518741dc5ac32c52ae9681efec3e73a23c':
Don't buzz when automatically connecting to captive portals
Lorenzo Colitti [Wed, 21 Oct 2015 01:22:34 +0000 (01:22 +0000)]
Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev am:
d214496319
am:
5c09f31e49
* commit '
5c09f31e499b662f1fb4982ec8aaa3d293252477':
Don't buzz when automatically connecting to captive portals
Jeff Sharkey [Wed, 21 Oct 2015 01:15:29 +0000 (01:15 +0000)]
Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev am:
55d2b6e8e6 am:
257d2ca7fd
am:
e01b99faa5
* commit '
e01b99faa54a083ae7b10db902a03f4aa6c9bd63':
Correctly derive ABI for apps on adopted media.
Lorenzo Colitti [Wed, 21 Oct 2015 01:15:27 +0000 (01:15 +0000)]
Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev
am:
d214496319
* commit '
d214496319785311f99f8415b7c8be3189420488':
Don't buzz when automatically connecting to captive portals
Lorenzo Colitti [Wed, 21 Oct 2015 01:10:10 +0000 (01:10 +0000)]
Merge "Don't buzz when automatically connecting to captive portals" into mnc-dr-dev
Jeff Sharkey [Wed, 21 Oct 2015 01:08:55 +0000 (01:08 +0000)]
Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev am:
55d2b6e8e6
am:
257d2ca7fd
* commit '
257d2ca7fd75926bd1cfd13d3a07809e2d51a097':
Correctly derive ABI for apps on adopted media.
Lorenzo Colitti [Wed, 21 Oct 2015 00:15:41 +0000 (09:15 +0900)]
Don't buzz when automatically connecting to captive portals
Play a sound and vibrate (by setting DEFAULT_ALL) only if the
user manually selected the network. This applies to both captive
portals and networks with no Internet access.
Bug:
24126143
Change-Id: Idf075d5c85f9f4b07a3431a25d1a3f7089cf1ee2
Jeff Sharkey [Wed, 21 Oct 2015 00:55:05 +0000 (00:55 +0000)]
Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev
am:
55d2b6e8e6
* commit '
55d2b6e8e6f364e2fd52c45b5fa3eb6a56082456':
Correctly derive ABI for apps on adopted media.
Jeff Sharkey [Wed, 21 Oct 2015 00:48:47 +0000 (00:48 +0000)]
Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev
Pavel Zhamaitsiak [Wed, 21 Oct 2015 00:45:29 +0000 (00:45 +0000)]
Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev am:
d99aade6e2 am:
d91b1f6bb8
am:
2c26344cee
* commit '
2c26344ceebd0971e6a88b54b5ddafd7130f2607':
Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
Pavel Zhamaitsiak [Wed, 21 Oct 2015 00:39:56 +0000 (00:39 +0000)]
Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev am:
d99aade6e2
am:
d91b1f6bb8
* commit '
d91b1f6bb84c22b9b20df2537500bf23f6b65ad2':
Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
Pavel Zhamaitsiak [Wed, 21 Oct 2015 00:32:10 +0000 (00:32 +0000)]
Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev
am:
d99aade6e2
* commit '
d99aade6e2c001cbb8e32c9342f20404bd614443':
Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
Jeff Sharkey [Wed, 21 Oct 2015 00:32:01 +0000 (17:32 -0700)]
Correctly derive ABI for apps on adopted media.
There was a bug causing PackageManager to think apps on adopted media
were actually in an ASEC, causing it to skip ABI derivation. This
change fixes the issue by copying the volume UUID into place early
in the scanning process.
Also fixes two places where we had incorrectly been including apps
on adopted media; switched them to check only for ASECs.
Bug:
24583803
Change-Id: If66d1bce02824a4d8e22f741b04a2abda0378cfb
Pavel Zhamaitsiak [Wed, 21 Oct 2015 00:27:27 +0000 (00:27 +0000)]
Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev
Rob Carr [Wed, 21 Oct 2015 00:06:43 +0000 (00:06 +0000)]
Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am:
9ada400e98 am:
894dd2b078
am:
a153a8072c
* commit '
a153a8072c0a28c36db2489a2ba13b1fc8e179db':
Catch exceptions thrown by pending activity launches.
Rob Carr [Tue, 20 Oct 2015 23:59:11 +0000 (23:59 +0000)]
Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am:
9ada400e98
am:
894dd2b078
* commit '
894dd2b078a5808704f462023c8fcb00b5579ef0':
Catch exceptions thrown by pending activity launches.
Rob Carr [Tue, 20 Oct 2015 23:51:23 +0000 (23:51 +0000)]
Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev
am:
9ada400e98
* commit '
9ada400e98451d3ff39ea284be5c205c8c8a3f95':
Catch exceptions thrown by pending activity launches.
Rob Carr [Tue, 20 Oct 2015 23:30:12 +0000 (23:30 +0000)]
Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev
Pavel Zhamaitsiak [Fri, 16 Oct 2015 23:39:00 +0000 (16:39 -0700)]
Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
Bug:
23731243
Change-Id: I3e08469ef293f0b619f95dd9fb48e8c582926270
Kevin Cernekee [Tue, 20 Oct 2015 22:59:44 +0000 (22:59 +0000)]
Merge "ignore initial request to disable iptable chain" into mnc-dr-dev am:
3554d62ca0 am:
d166333eb5
am:
a3625076e5
* commit '
a3625076e58bbcf4909a9c17ce18948020e65ac3':
ignore initial request to disable iptable chain
Matthew Williams [Tue, 20 Oct 2015 22:57:06 +0000 (22:57 +0000)]
Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev am:
cf43b5523f am:
07de80bd87
am:
4e18ec7343
* commit '
4e18ec7343ff91f0112dc0fedab6ea720857a6f5':
DO NOT MERGE Race condition in JobServiceContext
Kevin Cernekee [Tue, 20 Oct 2015 22:36:49 +0000 (22:36 +0000)]
Merge "ignore initial request to disable iptable chain" into mnc-dr-dev am:
3554d62ca0
am:
d166333eb5
* commit '
d166333eb5d3886a18a3a951d833a6d01cb8340d':
ignore initial request to disable iptable chain
Matthew Williams [Tue, 20 Oct 2015 22:34:18 +0000 (22:34 +0000)]
Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev am:
cf43b5523f
am:
07de80bd87
* commit '
07de80bd873c80dfcdaed5b992ac0ff01ed41483':
DO NOT MERGE Race condition in JobServiceContext
Alan Viverette [Tue, 20 Oct 2015 22:27:25 +0000 (22:27 +0000)]
Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev am:
4823493647 am:
ac02be311d
am:
41707942a8
* commit '
41707942a8aea8c9122482f28f2fd599e55d0791':
DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
Kevin Cernekee [Tue, 20 Oct 2015 22:18:22 +0000 (22:18 +0000)]
Merge "ignore initial request to disable iptable chain" into mnc-dr-dev
am:
3554d62ca0
* commit '
3554d62ca02bf6bc7777d1b22699876ec388fe6c':
ignore initial request to disable iptable chain
Matthew Williams [Tue, 20 Oct 2015 22:15:36 +0000 (22:15 +0000)]
Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev
am:
cf43b5523f
* commit '
cf43b5523fd12fdc69ea25cb6dbf5e95724927ec':
DO NOT MERGE Race condition in JobServiceContext
Kevin Cernekee [Tue, 20 Oct 2015 22:11:29 +0000 (22:11 +0000)]
Merge "ignore initial request to disable iptable chain" into mnc-dr-dev
Alan Viverette [Tue, 20 Oct 2015 22:09:16 +0000 (22:09 +0000)]
Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev am:
4823493647
am:
ac02be311d
* commit '
ac02be311dce2ad8144429753419ca8659aa46b6':
DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
Matthew Williams [Tue, 20 Oct 2015 22:03:17 +0000 (22:03 +0000)]
Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev
Alan Viverette [Tue, 20 Oct 2015 21:56:40 +0000 (21:56 +0000)]
Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev
am:
4823493647
* commit '
482349364715dfcd87dc83e0913fc60dc6df0497':
DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
Robert Carr [Tue, 20 Oct 2015 21:44:45 +0000 (14:44 -0700)]
Catch exceptions thrown by pending activity launches.
When we perform pendign activity launches from the handler
thread (as opposed to the a client binder thread), we must
take care exceptions from such will not bring the system
server down.
Bug:
24983901
Change-Id: I0e75f6b51bf6172a8e1b9cccc5fffb9d50c63e30
Alan Viverette [Tue, 20 Oct 2015 21:44:35 +0000 (21:44 +0000)]
Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev
Matthew Williams [Sat, 17 Oct 2015 04:04:51 +0000 (21:04 -0700)]
DO NOT MERGE Race condition in JobServiceContext
BUG:
23981171
JobServiceContext has a reference to the running job which
1) needs to be copied before providing access to outside callers
2) was not guarded by a lock in one case which might result in an NPE
Change-Id: I7eb04052f3fe63e7b386c564a6bdebf9144e976a
(cherry picked from commit
0cc7654e109d232e5d9a9de06482d8d349a21f28)
Alan Viverette [Tue, 20 Oct 2015 21:29:39 +0000 (17:29 -0400)]
DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
Bug:
22824701
Bug:
25107144
Change-Id: Ia0afd3edc20b8127605aef2653fa9b5472f41be2
(cherry picked from commit
130ce740d1aa4b9a7b024c76f8adec2c24278a81)
Matthew Williams [Tue, 20 Oct 2015 21:06:31 +0000 (21:06 +0000)]
DO NOT MERGE Sync extras bundle comparison can throw NPE am:
7d7a2254bc am:
cb937cbc6a
am:
d7d56a4feb
* commit '
d7d56a4feb5502e17dea4ebb4c9b22347be2b7d3':
DO NOT MERGE Sync extras bundle comparison can throw NPE
Xiaohui Chen [Tue, 20 Oct 2015 20:53:45 +0000 (13:53 -0700)]
ignore initial request to disable iptable chain
iptable child chains are disabled by default. Ignore the initial
disable request so netd won't throw errors when it cannot detach chains
that do not exist.
Bug:
22800189
Change-Id: I70b4b8b9e6a5dbffe32841941922b7fd92dcd3d6
Original-Change-Id: I9312dd558ba6d59dc6aa394afeb66a222daafcf9
[cernekee: backported from master branch]
Matthew Williams [Tue, 20 Oct 2015 20:52:55 +0000 (20:52 +0000)]
DO NOT MERGE Sync extras bundle comparison can throw NPE am:
7d7a2254bc
am:
cb937cbc6a
* commit '
cb937cbc6ae8a026a90ce524fd74a01e7d48726b':
DO NOT MERGE Sync extras bundle comparison can throw NPE
Elliott Hughes [Tue, 20 Oct 2015 20:47:16 +0000 (20:47 +0000)]
Merge "Fix lseek argument order." am:
12dccb8a24
am:
9bbe41642a
* commit '
9bbe41642a98a012f9df76224c1037127a8e5470':
Fix lseek argument order.
Matthew Williams [Tue, 20 Oct 2015 20:42:07 +0000 (20:42 +0000)]
DO NOT MERGE Sync extras bundle comparison can throw NPE
am:
7d7a2254bc
* commit '
7d7a2254bc41d2dfc34fbb8693cb0dad2ccd528a':
DO NOT MERGE Sync extras bundle comparison can throw NPE
Elliott Hughes [Tue, 20 Oct 2015 20:35:44 +0000 (20:35 +0000)]
Merge "Fix lseek argument order."
am:
12dccb8a24
* commit '
12dccb8a2450152102b32bf4882200f6b08a5a5a':
Fix lseek argument order.
Elliott Hughes [Tue, 20 Oct 2015 20:25:50 +0000 (20:25 +0000)]
Merge "Fix lseek argument order."
Elliott Hughes [Tue, 20 Oct 2015 20:23:18 +0000 (13:23 -0700)]
Fix lseek argument order.
Change-Id: Ibc2f98e4c26d0ac6ac7b4a73775c5213c4df4518
Rob Carr [Tue, 20 Oct 2015 19:26:38 +0000 (19:26 +0000)]
Merge "Correct ActivityInfo constructors." into mnc-dr-dev am:
cfea184d6c am:
e2a49862c1
am:
8caf80d571
* commit '
8caf80d571c37bc6fefd68227432fd49d76aaa93':
Correct ActivityInfo constructors.
Matthew Williams [Fri, 16 Oct 2015 19:01:31 +0000 (12:01 -0700)]
DO NOT MERGE Sync extras bundle comparison can throw NPE
BUG:
23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit
9ad2c8403354a985258c098681067e74b9e2f638)
Abodunrinwa Toki [Tue, 20 Oct 2015 18:51:03 +0000 (18:51 +0000)]
Merge "Re-set PROCESS_TEXT selection if nothing was returned." into mnc-dr-dev am:
3bd3655fd0 am:
9e97c20ed9
am:
0eef4ab567
* commit '
0eef4ab5678f9f3eaecd74b5e00990cef5b8d967':
Re-set PROCESS_TEXT selection if nothing was returned.
Rob Carr [Tue, 20 Oct 2015 18:50:57 +0000 (18:50 +0000)]
Merge "Correct ActivityInfo constructors." into mnc-dr-dev am:
cfea184d6c
am:
e2a49862c1
* commit '
e2a49862c147161292b802d70070b7f6c91cca00':
Correct ActivityInfo constructors.
Jeff Sharkey [Tue, 20 Oct 2015 18:36:27 +0000 (18:36 +0000)]
Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
Jeff Sharkey [Tue, 20 Oct 2015 18:35:06 +0000 (18:35 +0000)]
Merge "Add locking when mutating RecentTasks." into mnc-dr-dev am:
1a4efb77dd am:
3e9a3f3b71
am:
355e53ecf0
* commit '
355e53ecf00fdf1adc8df5bae3cfea6e648c5de8':
Add locking when mutating RecentTasks.
Jeff Sharkey [Tue, 20 Oct 2015 18:34:32 +0000 (18:34 +0000)]
Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
Rob Carr [Tue, 20 Oct 2015 18:33:58 +0000 (18:33 +0000)]
Merge "Correct ActivityInfo constructors." into mnc-dr-dev
am:
cfea184d6c
* commit '
cfea184d6c0268b92ed55276d2b686962c8ee531':
Correct ActivityInfo constructors.
Jeff Sharkey [Tue, 20 Oct 2015 18:33:48 +0000 (18:33 +0000)]
Merge "Ignore network policies with missing IMSI." into mnc-dr-dev am:
38463bb950 am:
5d7604323f
am:
3b30aae6e7
* commit '
3b30aae6e702cbdad4ada69b76e4bc50fa2e161c':
Ignore network policies with missing IMSI.
Abodunrinwa Toki [Tue, 20 Oct 2015 18:33:36 +0000 (18:33 +0000)]
Merge "Re-set PROCESS_TEXT selection if nothing was returned." into mnc-dr-dev am:
3bd3655fd0
am:
9e97c20ed9
* commit '
9e97c20ed9f4377caf4de902659b0f97b7b4a90d':
Re-set PROCESS_TEXT selection if nothing was returned.
Jeff Sharkey [Tue, 20 Oct 2015 18:32:45 +0000 (18:32 +0000)]
Merge "Add locking when mutating RecentTasks." into mnc-dr-dev am:
1a4efb77dd am:
3e9a3f3b71
am:
355e53ecf0
* commit '
355e53ecf00fdf1adc8df5bae3cfea6e648c5de8':
Add locking when mutating RecentTasks.
Jeff Sharkey [Tue, 20 Oct 2015 18:30:16 +0000 (18:30 +0000)]
Merge "Ignore network policies with missing IMSI." into mnc-dr-dev am:
38463bb950 am:
5d7604323f
am:
3b30aae6e7
* commit '
3b30aae6e702cbdad4ada69b76e4bc50fa2e161c':
Ignore network policies with missing IMSI.
Alan Viverette [Tue, 20 Oct 2015 18:27:41 +0000 (18:27 +0000)]
Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev am:
840f38905c am:
e3d745291e
am:
c3e46adc77
* commit '
c3e46adc7797b4e894ef1e8ffd972acddb8fbbfa':
Update drawable matrix when bounds change in invalidateDrawable()
George Mount [Tue, 20 Oct 2015 18:25:13 +0000 (18:25 +0000)]
Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev am:
1313020acc am:
ee15f087db
am:
bc71059223
* commit '
bc7105922318391815660c2082ccfc621d27103c':
Set the bounds on the drawable for ChangeBounds reparenting.
Rob Carr [Tue, 20 Oct 2015 18:20:27 +0000 (18:20 +0000)]
Merge "Correct ActivityInfo constructors." into mnc-dr-dev
Abodunrinwa Toki [Tue, 20 Oct 2015 18:06:44 +0000 (18:06 +0000)]
Merge "Re-set PROCESS_TEXT selection if nothing was returned." into mnc-dr-dev
am:
3bd3655fd0
* commit '
3bd3655fd05a548f6e60cfccd4185a4b9ae2a7d6':
Re-set PROCESS_TEXT selection if nothing was returned.
Jeff Sharkey [Tue, 20 Oct 2015 17:53:14 +0000 (17:53 +0000)]
Merge "Add locking when mutating RecentTasks." into mnc-dr-dev am:
1a4efb77dd
am:
3e9a3f3b71
* commit '
3e9a3f3b71851c86bedbfc369787a4ce0ea5f2d8':
Add locking when mutating RecentTasks.
Jeff Sharkey [Tue, 20 Oct 2015 17:48:20 +0000 (17:48 +0000)]
Merge "Ignore network policies with missing IMSI." into mnc-dr-dev am:
38463bb950
am:
5d7604323f
* commit '
5d7604323fdcf3a26085a9545adfc595205f12da':
Ignore network policies with missing IMSI.
Robert Carr [Tue, 15 Sep 2015 19:30:42 +0000 (12:30 -0700)]
Correct ActivityInfo constructors.
ActivityInfo was missing initialization for the
documentLaunchMode flag in the copy-constructor
and the Parcel constructor. The copy-constructor
is used in multi-user/profile mode to create a
seperate instance of the ActivityInfo per uid
and this was manifesting in the linked bug.
Bug:
21590916
Change-Id: I6f71d94ec32ec6326d23c9b62e9d8d319e2fa25e
(cherry picked from commit
3e2e0117858eb02fef55ca4c245e8b920aedc6eb)
Abodunrinwa Toki [Tue, 20 Oct 2015 17:47:28 +0000 (17:47 +0000)]
Merge "Re-set PROCESS_TEXT selection if nothing was returned." into mnc-dr-dev
Alan Viverette [Tue, 20 Oct 2015 17:47:06 +0000 (17:47 +0000)]
Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev am:
840f38905c
am:
e3d745291e
* commit '
e3d745291e1b4de16bddb545424b430cc48328c7':
Update drawable matrix when bounds change in invalidateDrawable()
Michael Wright [Tue, 20 Oct 2015 17:44:46 +0000 (17:44 +0000)]
resolve merge conflicts of
57a5cba606 to cw-e-dev. am:
bab2b42445
am:
b959ce872c
* commit '
b959ce872c37e5f49c8f77ad188fcb9970dcce7a':
Add SystemUI component to watch for keyboard attachment.
George Mount [Tue, 20 Oct 2015 17:44:41 +0000 (17:44 +0000)]
Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev am:
1313020acc
am:
ee15f087db
* commit '
ee15f087db590ea21f5ce44e4571bbcc2885aaf2':
Set the bounds on the drawable for ChangeBounds reparenting.
Jeff Sharkey [Tue, 20 Oct 2015 17:33:57 +0000 (17:33 +0000)]
Merge "Add locking when mutating RecentTasks." into mnc-dr-dev
am:
1a4efb77dd
* commit '
1a4efb77dd3c503634f1f6495d931d1a570f51f5':
Add locking when mutating RecentTasks.
Jeff Sharkey [Tue, 20 Oct 2015 17:32:57 +0000 (17:32 +0000)]
Merge "Ignore network policies with missing IMSI." into mnc-dr-dev
am:
38463bb950
* commit '
38463bb950390a7b50fb07a990d9ed6990d07539':
Ignore network policies with missing IMSI.
Alan Viverette [Tue, 20 Oct 2015 17:24:45 +0000 (17:24 +0000)]
Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev
am:
840f38905c
* commit '
840f38905c073044077cb2bef68d20971f5d3d39':
Update drawable matrix when bounds change in invalidateDrawable()
George Mount [Tue, 20 Oct 2015 17:23:45 +0000 (17:23 +0000)]
Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev
am:
1313020acc
* commit '
1313020acc93e601c98779d8859f44391c504ba2':
Set the bounds on the drawable for ChangeBounds reparenting.
Michael Wright [Tue, 20 Oct 2015 17:23:23 +0000 (17:23 +0000)]
resolve merge conflicts of
57a5cba606 to cw-e-dev.
am:
bab2b42445
* commit '
bab2b424453e556a2e7bb9470d70673793dd82df':
Add SystemUI component to watch for keyboard attachment.
Jeff Sharkey [Tue, 20 Oct 2015 17:22:27 +0000 (17:22 +0000)]
Merge "Add locking when mutating RecentTasks." into mnc-dr-dev
Jeff Sharkey [Tue, 20 Oct 2015 17:21:46 +0000 (17:21 +0000)]
Merge "Ignore network policies with missing IMSI." into mnc-dr-dev
Alan Viverette [Tue, 20 Oct 2015 16:54:12 +0000 (16:54 +0000)]
Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev
George Mount [Tue, 20 Oct 2015 16:41:33 +0000 (16:41 +0000)]
Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev
Abodunrinwa Toki [Mon, 19 Oct 2015 23:19:23 +0000 (00:19 +0100)]
Re-set PROCESS_TEXT selection if nothing was returned.
Bug:
25043887
Change-Id: If069a5e23f1adf6a2c3aac8fe7e3f19cff2e28ad
Michael Wright [Tue, 20 Oct 2015 16:06:27 +0000 (17:06 +0100)]
resolve merge conflicts of
57a5cba606 to cw-e-dev.
Change-Id: Ib43f0cf0b285c9799239658859af735279f87fff
Michael Wright [Tue, 20 Oct 2015 15:31:01 +0000 (15:31 +0000)]
Merge "Add SystemUI component to watch for keyboard attachment." into mnc-dr-dev
Todd Kennedy [Tue, 20 Oct 2015 14:58:40 +0000 (14:58 +0000)]
Merge "Retain fragment loaders" into mnc-dr-dev am:
ad968cf4e5 am:
6320767fb1
am:
02940eb47f
* commit '
02940eb47fc1bdb3b069e42190bf8a70a9b916bf':
Retain fragment loaders
Todd Kennedy [Tue, 20 Oct 2015 14:50:20 +0000 (14:50 +0000)]
Merge "Retain fragment loaders" into mnc-dr-dev am:
ad968cf4e5
am:
6320767fb1
* commit '
6320767fb181f48ea40da7da84167dbff373ea10':
Retain fragment loaders
Todd Kennedy [Tue, 20 Oct 2015 14:41:23 +0000 (14:41 +0000)]
Merge "Retain fragment loaders" into mnc-dr-dev
am:
ad968cf4e5
* commit '
ad968cf4e55afdd897ea84a44b7450442aea1e1d':
Retain fragment loaders
Todd Kennedy [Tue, 20 Oct 2015 14:36:00 +0000 (14:36 +0000)]
Merge "Retain fragment loaders" into mnc-dr-dev
Alan Viverette [Tue, 20 Oct 2015 13:48:58 +0000 (09:48 -0400)]
Update drawable matrix when bounds change in invalidateDrawable()
Bug:
24797872
Change-Id: Ib2bcce6f7d6fab33633a915882821b00d94e4e44
riddle_hsu [Tue, 20 Oct 2015 08:34:05 +0000 (16:34 +0800)]
Ensure state transition of paused activity.
If there are 2 activties launched during screen off.
Both of them will be scheduled to pause immediately.
But if the first one does not complete pause in time,
and the second one is a non-fullscreen activity, the
first one will still be visible and no need to stop.
After the second one complete pause, mPausingActivity
is cleared, then the first one's complete pause is failed
and keep state at pausing. If it calls finish, it cannot
be destroyed because its state is pausing so expect it will
be paused later, but actually is has complete paused.
Sample and video:
https://code.google.com/p/android/issues/detail?id=190955
Solution:
A failed-to-pause activity should still change state to paused
if it is pausing. Then when the first activity calls finish,
it will satisfy the condition in ActivityStack.finishActivityLocked
"r.state != ActivityState.PAUSING" to continue the finish flow.
Change-Id: I2f211ddf5039b332b0c7d01ccd043aa18fe168f7
Adam Powell [Tue, 20 Oct 2015 01:49:35 +0000 (01:49 +0000)]
Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev am:
4ecfbcfdea am:
eeed032eae
am:
2a61cc8032
* commit '
2a61cc803203e605b1f4a017deec0aedb21605f3':
DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
Adam Powell [Tue, 20 Oct 2015 01:12:40 +0000 (01:12 +0000)]
Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev am:
4ecfbcfdea
am:
eeed032eae
* commit '
eeed032eae1ac03509155fe7002189df054bb8af':
DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
Mathieu Chartier [Tue, 20 Oct 2015 01:12:36 +0000 (01:12 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space" am:
59d548e1e5
am:
7acf8c21d8
* commit '
7acf8c21d848305400f645126918100f1d99f921':
Fix read_mapinfo to recognize free list large object space
Adam Powell [Tue, 20 Oct 2015 00:54:34 +0000 (00:54 +0000)]
Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev
am:
4ecfbcfdea
* commit '
4ecfbcfdeaed67c3a08002069a530fa58582a48b':
DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
Jeff Sharkey [Tue, 20 Oct 2015 00:46:04 +0000 (17:46 -0700)]
Add locking when mutating RecentTasks.
Otherwise there is a really rare race condition where we try tearing
down the tasks while we're still setting them up.
Bug:
25078914
Change-Id: Icf89241f9abec3fadc8606cfb4fbc029bbe91515
Adam Powell [Tue, 20 Oct 2015 00:33:37 +0000 (00:33 +0000)]
Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev
Adrian Roos [Tue, 20 Oct 2015 00:32:09 +0000 (00:32 +0000)]
Merge "Reload content description of KeyButtonView" into mnc-dr-dev am:
9a345f31f2 am:
574b5f71e8
am:
011f9eb1fc
* commit '
011f9eb1fcdfd5bda83185ee2190664b3bc3f22f':
Reload content description of KeyButtonView
Mathieu Chartier [Tue, 20 Oct 2015 00:30:52 +0000 (00:30 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space"
am:
59d548e1e5
* commit '
59d548e1e54fa753d3776647b98dc34ea7c27685':
Fix read_mapinfo to recognize free list large object space
Adam Powell [Mon, 19 Oct 2015 23:25:08 +0000 (16:25 -0700)]
DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
An old optimization in ViewRoot prevents updating a window surface
while a window animation is playing. SystemUI and other small system
components that blend these animations disable this for a smoother
experience. Disable it in ResolverActivity as well.
Bug
24989381
Change-Id: Iac7d1c7b1101ed8d2bc4c3557277a773ce871beb
Todd Kennedy [Mon, 19 Oct 2015 23:53:37 +0000 (23:53 +0000)]
Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am:
ec8a4ecc92
am:
7e5b18a9dd
* commit '
7e5b18a9ddfff06f01cb97dbea12ae58a662870e':
Todd Kennedy [Mon, 19 Oct 2015 23:52:37 +0000 (23:52 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev am:
986d4b482d am:
d419d86952
am:
e9c7512147
* commit '
e9c751214715f3d136ae07fe9f553c488d01f352':
Set host when restoring a fragment
OSDN Git Service
