OSDN Git Service
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.
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.
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
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
Jeff Sharkey [Mon, 19 Oct 2015 23:52:08 +0000 (16:52 -0700)]
Ignore network policies with missing IMSI.
In rare cases, we might have created a network policy before an IMSI
was available. Because this policy is persisted, and we incorrectly
think that it always applies, we end up annoying the user when data
usage goes over the 2GB default warning threshold.
This patch fixes the network matching logic to ignore these empty
network policies when present.
Bug:
24972775
Change-Id: Id26499b6716121dddf0f2c05b848b0bed5995e72
Mathieu Chartier [Mon, 19 Oct 2015 23:51:35 +0000 (23:51 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am:
7f2deeeef5 am:
df0cc41a7b
am:
efa447e1ab
* commit '
efa447e1ab5a51c96219fc1d6204c128dbbaf661':
Fix read_mapinfo to recognize free list large object space
Svetoslav Ganov [Mon, 19 Oct 2015 23:50:28 +0000 (23:50 +0000)]
Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am:
e199016a82 am:
aebff7f1ad
am:
2a95159d2c
* commit '
2a95159d2cce4321205ca7f40027a97acc2fb77e':
Don't allow concurrent permission requests.
Adrian Roos [Mon, 19 Oct 2015 23:50:19 +0000 (23:50 +0000)]
Merge "Reload content description of KeyButtonView" into mnc-dr-dev am:
9a345f31f2
am:
574b5f71e8
* commit '
574b5f71e80cb5b205dcca2d9ef33820e33a850e':
Reload content description of KeyButtonView
Adrian Roos [Mon, 19 Oct 2015 23:43:32 +0000 (23:43 +0000)]
Merge "Reload content description of KeyButtonView" into mnc-dr-dev
am:
9a345f31f2
* commit '
9a345f31f23fc581f9ce501e854c821e865920ca':
Reload content description of KeyButtonView
George Mount [Mon, 19 Oct 2015 19:14:01 +0000 (12:14 -0700)]
Set the bounds on the drawable for ChangeBounds reparenting.
Bug
24993183
The bounds for the drawable weren't being set, so the
drawable was never drawn to the correct size.
Change-Id: I992951f28ee6fac2ce8752d2dc0e23f51d3cf584
(cherry picked from commit
f2a3703696f5dc8b1a0d243051e0db65c2145452)
Todd Kennedy [Mon, 19 Oct 2015 22:31:51 +0000 (15:31 -0700)]
Retain fragment loaders
Remove the partial fix [it did not work for child fragment managers]
and replace with a more general fix that works with all fragments.
Bug:
23838271
Change-Id: I88b465f6a06a6ad627b9651b9e2eea41fae08972
Todd Kennedy [Mon, 19 Oct 2015 23:32:29 +0000 (23:32 +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
* commit '
ec8a4ecc9210fa509283a860bb91814f28d28a4f':
Todd Kennedy [Mon, 19 Oct 2015 23:31:34 +0000 (23:31 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev am:
986d4b482d
am:
d419d86952
* commit '
d419d86952fd962e34011eb3d989f748e678691d':
Set host when restoring a fragment
Mathieu Chartier [Mon, 19 Oct 2015 23:29:56 +0000 (23:29 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am:
7f2deeeef5
am:
df0cc41a7b
* commit '
df0cc41a7bfa480ce5584420bceda850ad0c56c8':
Fix read_mapinfo to recognize free list large object space
Svetoslav Ganov [Mon, 19 Oct 2015 23:28:55 +0000 (23:28 +0000)]
Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am:
e199016a82
am:
aebff7f1ad
* commit '
aebff7f1ad23299d1ed71e83a3e76619a1a03574':
Don't allow concurrent permission requests.
Adrian Roos [Mon, 19 Oct 2015 23:26:47 +0000 (23:26 +0000)]
Merge "Reload content description of KeyButtonView" into mnc-dr-dev
Todd Kennedy [Mon, 19 Oct 2015 23:25:04 +0000 (23:25 +0000)]
Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev
Todd Kennedy [Mon, 19 Oct 2015 23:22:57 +0000 (23:22 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev
am:
986d4b482d
* commit '
986d4b482da952cd07e329b3bd11c935edd7ec01':
Set host when restoring a fragment
Todd Kennedy [Mon, 19 Oct 2015 23:19:51 +0000 (23:19 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev
am:
986d4b482d
* commit '
986d4b482da952cd07e329b3bd11c935edd7ec01':
Set host when restoring a fragment
Mathieu Chartier [Mon, 19 Oct 2015 23:17:09 +0000 (23:17 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev
am:
7f2deeeef5
* commit '
7f2deeeef53887dcad74b8aed86936983353cec4':
Fix read_mapinfo to recognize free list large object space
Svetoslav Ganov [Mon, 19 Oct 2015 23:13:46 +0000 (23:13 +0000)]
Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev
am:
e199016a82
* commit '
e199016a82329b645a86db345c2d39322c8ad03a':
Don't allow concurrent permission requests.
Todd Kennedy [Mon, 19 Oct 2015 22:52:27 +0000 (22:52 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev
Mathieu Chartier [Mon, 19 Oct 2015 22:47:45 +0000 (22:47 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev
Mathieu Chartier [Mon, 19 Oct 2015 20:48:34 +0000 (13:48 -0700)]
Fix read_mapinfo to recognize free list large object space
Bug:
25081604
(cherry picked from commit
6421da8f46e2a60da55939d8a4f7d91ab286dfcf)
Change-Id: If676c2309e3e397676fa8cef21405c34db7d5db2
Svetoslav Ganov [Mon, 19 Oct 2015 22:41:35 +0000 (22:41 +0000)]
Merge "Don't allow concurrent permission requests." into mnc-dr-dev
Mathieu Chartier [Mon, 19 Oct 2015 22:36:40 +0000 (22:36 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space"
Mathieu Chartier [Mon, 19 Oct 2015 20:48:34 +0000 (13:48 -0700)]
Fix read_mapinfo to recognize free list large object space
Bug:
25081604
Change-Id: Ie277fd964afcdc80b97432cbd611a8136a2059d7
Aravind Akella [Mon, 19 Oct 2015 21:41:36 +0000 (21:41 +0000)]
am
73b6750c: am
005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am:
a817c90a7a
* commit '
73b6750cb6c3c9d5d7602878fd7020fa114a3cd3':
Fix a possible race condition in SensorManager initialization.
Aravind Akella [Mon, 19 Oct 2015 21:36:10 +0000 (21:36 +0000)]
am
005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am:
a817c90a7a
* commit '
005d36d1b0653fccc5aaea2af36a2622f6d74f34':
Fix a possible race condition in SensorManager initialization.
Aravind Akella [Mon, 19 Oct 2015 21:32:25 +0000 (21:32 +0000)]
Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev
am:
a817c90a7a
* commit '
a817c90a7ab296473345b0e106acc9be4e5b678c':
Fix a possible race condition in SensorManager initialization.
Aravind Akella [Mon, 19 Oct 2015 21:15:28 +0000 (21:15 +0000)]
Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev
Todd Kennedy [Mon, 19 Oct 2015 19:48:55 +0000 (12:48 -0700)]
Set host when restoring a fragment
When we restore a fragment [i.e. on configuration change], we need to
make sure the host is set prior to calling into lifecycle methods
such as onInflate(). These use data contained within the host.
Bug:
22512520
Change-Id: I709365a858cfc555ec5b7fc200629fa8d022faad
Aravind Akella [Fri, 16 Oct 2015 21:18:40 +0000 (14:18 -0700)]
Fix a possible race condition in SensorManager initialization.
Bug:
24526176
Change-Id: Ib8bae6eee16a5b787d3c2da6ef03af311cfdfadc
Geoff Mendal [Mon, 19 Oct 2015 16:08:22 +0000 (16:08 +0000)]
am
e0f00d04: (-s ours) am
a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
7ba59c3559 -s ours
* commit '
e0f00d04d4d68348a8baf03f3c51521389aff576':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 16:02:57 +0000 (16:02 +0000)]
am
a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
7ba59c3559 -s ours
* commit '
a6e7b3ae756946212937054bb079da1d472c0cda':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 15:59:20 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
7ba59c3559 -s ours
* commit '
7ba59c35596bd53ebc9b5bed40b2d7bd2e5ac94d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 15:55:17 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 19 Oct 2015 15:03:19 +0000 (08:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I76444ef3a3911763f41010e0cd0f5015a2f756e9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Oct 2015 14:22:21 +0000 (14:22 +0000)]
am
ffdbfaaf: (-s ours) am
2a09706e: (-s ours) Import translations. DO NOT MERGE am:
5e4863205e -s ours
* commit '
ffdbfaaff2f5172fc0af8d5f13ec3fad0c53f826':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:17:11 +0000 (14:17 +0000)]
am
2a09706e: (-s ours) Import translations. DO NOT MERGE am:
5e4863205e -s ours
* commit '
2a09706e86794f6482f005f5bcca2ee513a3b1d9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:11:34 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am:
5e4863205e -s ours
* commit '
5e4863205ee459cd8813f45e91b2e67c603d38ef':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:01:55 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie8f3e950a4c69ad49e6f370b97398b507d488111
Auto-generated-cl: translation import
Chris Wren [Sat, 17 Oct 2015 21:46:00 +0000 (21:46 +0000)]
am
9c25e23c: am
3472f18e: am
c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev
* commit '
9c25e23c4b571f9c9ff3fd69408c4cfd03385e82':
count notification peeks by window action
Chris Wren [Sat, 17 Oct 2015 21:41:39 +0000 (21:41 +0000)]
am
3472f18e: am
c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev
* commit '
3472f18e0218c7d7a991da50db8251471fd8c25d':
count notification peeks by window action
Chris Wren [Sat, 17 Oct 2015 21:35:25 +0000 (21:35 +0000)]
am
c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev
* commit '
c7f2058cefd00bdce31a77646afa407bdf269809':
count notification peeks by window action
Chris Wren [Sat, 17 Oct 2015 21:30:37 +0000 (21:30 +0000)]
Merge "count notification peeks by window action" into mnc-dr-dev
Ruben Brunk [Sat, 17 Oct 2015 07:13:24 +0000 (07:13 +0000)]
am
55dd957d: am
7a027807: am
c03443b2: Fix lens shading map origin calculation.
* commit '
55dd957d87e847c1ae7d4ddeff68fdb0b18ee23b':
Fix lens shading map origin calculation.
Ruben Brunk [Sat, 17 Oct 2015 07:07:32 +0000 (07:07 +0000)]
am
7a027807: am
c03443b2: Fix lens shading map origin calculation.
* commit '
7a027807a73aaa578d8f7a457438daac73158af0':
Fix lens shading map origin calculation.
Ruben Brunk [Sat, 17 Oct 2015 07:01:19 +0000 (07:01 +0000)]
am
c03443b2: Fix lens shading map origin calculation.
* commit '
c03443b23de0b474080168d892cd685283c3285b':
Fix lens shading map origin calculation.
Ruben Brunk [Thu, 15 Oct 2015 00:46:52 +0000 (17:46 -0700)]
Fix lens shading map origin calculation.
Bug:
24816235
Change-Id: Id4609f3349f86c811cbc3d5e1839f880da926486
OSDN Git Service
