OSDN Git Service
Tenghui Zhu [Tue, 3 Nov 2015 19:40:18 +0000 (19:40 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev
am:
61c93eb16d
* commit '
61c93eb16d91bd210948af6e812517e3c03535b4':
Use clang for libhwui
Tenghui Zhu [Tue, 3 Nov 2015 19:25:43 +0000 (19:25 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev
Chris Craik [Tue, 3 Nov 2015 18:33:34 +0000 (10:33 -0800)]
Use clang for libhwui
bug:
25417885
Change-Id: I0ef8034d79ba3682925e3c2a4b7ccd833fd4f156
Dianne Hackborn [Tue, 3 Nov 2015 18:27:30 +0000 (18:27 +0000)]
Merge "Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev
am:
71e4984505
* commit '
71e49845054a3a7dacc51efc4fe658818caec048':
Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot
Dianne Hackborn [Tue, 3 Nov 2015 18:21:23 +0000 (18:21 +0000)]
Merge "Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev
Thierry Strudel [Tue, 3 Nov 2015 06:40:00 +0000 (06:40 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev
am:
1942be506e
* commit '
1942be506eb16589e3059fa62ea7b718440fb386':
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Thierry Strudel [Tue, 3 Nov 2015 06:35:59 +0000 (06:35 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev
Tyler Gunn [Tue, 3 Nov 2015 04:49:42 +0000 (04:49 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
am:
8b86c76296
* commit '
8b86c7629676eeea490531b2a412873e0196eb6f':
Improve comment on EXTRA_CALL_RAT_TYPE.
Tyler Gunn [Tue, 3 Nov 2015 04:44:53 +0000 (04:44 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
Sanket Padawe [Tue, 3 Nov 2015 01:52:14 +0000 (01:52 +0000)]
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev
am:
b57c65b00e
* commit '
b57c65b00efbcc6c8ed5a64b2c314dbca72d5554':
Fix a crash while printing ICCID because of alphabets in UICC.
Sanket Padawe [Tue, 3 Nov 2015 01:47:04 +0000 (01:47 +0000)]
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev
Selim Cinek [Tue, 3 Nov 2015 01:21:44 +0000 (01:21 +0000)]
Fixed a bug where the panel could get stuck closing
am:
b0e4f9e97e
* commit '
b0e4f9e97e272783f08b2245219239aaa667073d':
Fixed a bug where the panel could get stuck closing
Dianne Hackborn [Mon, 2 Nov 2015 21:43:29 +0000 (13:43 -0800)]
Fix issue #
25357209: Could not send SMS or MMS messages, had to reboot
I think what probably happened is that since we only report an app
going in to the "interaction" state as an interaction event to usage
stats, apps that sit around in that state forever will only see one
interaction at the start and never again. So usage stats could start
thinking they are idle.
Fix this by having the activity manager report an interaction event
for such long running applications at least once a day.
Also, because it is correct and for paranoia by protected us another
way, system uids should never go in to standby.
Change-Id: I8a3805bfca86cbe78560488a649ecd07427da99a
Sanket Padawe [Mon, 2 Nov 2015 23:45:18 +0000 (15:45 -0800)]
Fix a crash while printing ICCID because of alphabets in UICC.
Bug:
25401769
Change-Id: Ieda058817b8d3cb4b1696fd9932bd0f10da55573
Selim Cinek [Mon, 2 Nov 2015 21:42:58 +0000 (13:42 -0800)]
Fixed a bug where the panel could get stuck closing
When mClosing was set even though the panel was not
expanding, the variable was never reset leading to
bad states like the notification shade not updating,
people missing calls and similar bad bugs.
Bug:
25338991
Change-Id: I4362fda257770c98c5f9ba75a5622b14f74dc5ae
Svetoslav Ganov [Mon, 2 Nov 2015 21:04:25 +0000 (21:04 +0000)]
Merge "Don\'t try overriding system fixed permissions on install" into mnc-dr-dev
am:
a47f9dad2b
* commit '
a47f9dad2bd70b594e445a6a448877122f28517a':
Don't try overriding system fixed permissions on install
Svetoslav Ganov [Mon, 2 Nov 2015 20:57:12 +0000 (20:57 +0000)]
Merge "Don't try overriding system fixed permissions on install" into mnc-dr-dev
Svet Ganov [Mon, 2 Nov 2015 17:32:01 +0000 (09:32 -0800)]
Don't try overriding system fixed permissions on install
bug:
25397466
Change-Id: Ie92ec000a94b757178ddfdd9384407535f4af9db
Svetoslav Ganov [Mon, 2 Nov 2015 19:38:30 +0000 (19:38 +0000)]
Merge "Allow verifier to grant permissions" into mnc-dr-dev
am:
cfa233eefb
* commit '
cfa233eefb5b77c96a3239a5a51f381a7f0722c9':
Allow verifier to grant permissions
Svetoslav Ganov [Mon, 2 Nov 2015 19:33:44 +0000 (19:33 +0000)]
Merge "Allow verifier to grant permissions" into mnc-dr-dev
Tyler Gunn [Mon, 2 Nov 2015 19:24:57 +0000 (11:24 -0800)]
Improve comment on EXTRA_CALL_RAT_TYPE.
Adding comments to EXTRA_CALL_RAT_TYPE to make it clear what it is used
for, and what values are expected.
Bug:
20144385
Change-Id: I248aca61abc8a57d7aeef650e48cc498e41c859b
Jeff Sharkey [Mon, 2 Nov 2015 17:51:54 +0000 (17:51 +0000)]
PackageSettingBase needs to copy volume UUID.
am:
3b1c6e03f6
* commit '
3b1c6e03f67ba8e4a4f4a98e996c7ceabf36affa':
PackageSettingBase needs to copy volume UUID.
Jeff Sharkey [Sat, 31 Oct 2015 20:58:54 +0000 (13:58 -0700)]
PackageSettingBase needs to copy volume UUID.
When copying all fields from one PackageSettingBase to another, we
also need to copy volumeUuid, which had previously been missed.
Without this, packages using sharedUserId that are installed on
adopted storage devices will be destroyed, since after reboot we
think they actually belong on internal storage (where volumeUuid is
null).
Bug:
25334169
Change-Id: I223361bd1e19e7d5dd78626682ac7c5cbecb9fa1
Jeff Sharkey [Fri, 30 Oct 2015 21:37:21 +0000 (21:37 +0000)]
Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev
am:
a975732a83
* commit '
a975732a8302893a40cdc444f893bf09b7669173':
Handle "uninstalled" apps when pruning app-ops.
Jeff Sharkey [Fri, 30 Oct 2015 21:32:28 +0000 (21:32 +0000)]
Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev
Pavel Zhamaitsiak [Fri, 30 Oct 2015 14:26:55 +0000 (14:26 +0000)]
Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev
am:
4ec415800f
* commit '
4ec415800fd55d2bb128d7635f8b984145dbe983':
IMS: Support For Per-Call RAT Info
Pavel Zhamaitsiak [Fri, 30 Oct 2015 14:22:28 +0000 (14:22 +0000)]
Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev
Jeff Sharkey [Fri, 30 Oct 2015 02:00:44 +0000 (19:00 -0700)]
Handle "uninstalled" apps when pruning app-ops.
During system boot, we prune app-ops belonging to apps that have
been uninstalled. However, apps installed on adopted storage devices
haven't been scanned at this point, so they appear to be uninstalled.
To avoid pruning app-ops for these apps, we need a getPackageUid()
variant that also considers "uninstalled" apps for which we still
have PackageSetting values.
Bug:
25206071
Change-Id: I1820f674d45c5ddc1c5f10ed7d859e7025005e28
Omkar Kolangade [Thu, 29 Oct 2015 22:06:27 +0000 (15:06 -0700)]
IMS: Support For Per-Call RAT Info
Adding the extra key that will be used to
propagate RAT information for each call via
call extras. The key is used in IMS Service.
Bug:
20144385
Change-Id: Ia7ca81d661afb579fd25315036c43489b1dca50d
Thierry Strudel [Thu, 29 Oct 2015 21:40:29 +0000 (14:40 -0700)]
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Bug:
24986869
Change-Id: Iab4e5ce6be0b5279ce85f868037ba256ee62c0ac
Signed-off-by: Thierry Strudel <tstrudel@google.com>
Svetoslav [Fri, 30 Oct 2015 00:00:06 +0000 (17:00 -0700)]
Allow verifier to grant permissions
bug:
25329324
Change-Id: I2ac01a983ad812df7725a0499a8d9b470a7ea481
Carlos Valdivia [Thu, 29 Oct 2015 23:51:55 +0000 (23:51 +0000)]
Get rid of getTypesVisibleToCaller log spam.
am:
02bffab9dc
* commit '
02bffab9dc6cc50dd0efdb4bff4feaa9672de5ea':
Get rid of getTypesVisibleToCaller log spam.
Carlos Valdivia [Thu, 29 Oct 2015 23:41:21 +0000 (16:41 -0700)]
Get rid of getTypesVisibleToCaller log spam.
Bug:
25062620
Change-Id: Ia3080c501a288522a5b1de88d50f365357418ba8
Nick Kralevich [Thu, 29 Oct 2015 21:31:03 +0000 (21:31 +0000)]
UsbDeviceManager: set mUsbDataUnlocked=false on user switch
am:
5701321701
* commit '
5701321701a319d3f2d98365a82266eeddaed895':
UsbDeviceManager: set mUsbDataUnlocked=false on user switch
Nick Kralevich [Thu, 29 Oct 2015 19:45:23 +0000 (12:45 -0700)]
UsbDeviceManager: set mUsbDataUnlocked=false on user switch
Make sure access to MTP data is relocked when a user switch occurs.
Bug:
25288494
Change-Id: I69dafc7f51b847f4dba1993a85fb1a51df1a5e37
Geoff Mendal [Thu, 29 Oct 2015 19:38:35 +0000 (19:38 +0000)]
Import translations. DO NOT MERGE
am:
c3cd7b1585 -s ours
* commit '
c3cd7b1585e7ca2b3b1c9ea2ea7a9971c4b0be01':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 29 Oct 2015 19:27:09 +0000 (12:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25319151
Change-Id: I4170f31d992d23a365c98fe5e799a31ef48f17bd
Lorenzo Colitti [Thu, 29 Oct 2015 08:02:32 +0000 (08:02 +0000)]
Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev
am:
a2cc04736d
* commit '
a2cc04736d0f9b9621c87ce8d244fd8fd909df7d':
Don't crash if a DHCP server doesn't send the server ID option.
Lorenzo Colitti [Thu, 29 Oct 2015 07:57:13 +0000 (07:57 +0000)]
Merge "Don't crash if a DHCP server doesn't send the server ID option." into mnc-dr-dev
Lorenzo Colitti [Thu, 29 Oct 2015 06:21:54 +0000 (15:21 +0900)]
Don't crash if a DHCP server doesn't send the server ID option.
This violates a MUST in RFC2131, but apparently some
implementations don't know or care.
Bug:
25343517
Change-Id: I80459b58ffe231e7ed64e77bafa157a96b745149
Svetoslav Ganov [Thu, 29 Oct 2015 01:17:11 +0000 (01:17 +0000)]
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
am:
2658cb002a
* commit '
2658cb002abae9341c9a82bfeaed764ba5bf97c8':
Make SYSTEM_ALERT_WINDOW development permission
Svetoslav Ganov [Thu, 29 Oct 2015 01:10:46 +0000 (01:10 +0000)]
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
Geoff Mendal [Wed, 28 Oct 2015 14:43:41 +0000 (14:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
c7522c0b1c -s ours
* commit '
c7522c0b1c3b8f445ddc1b75f0600363ecbd27a6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:38:11 +0000 (14:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 28 Oct 2015 14:37:31 +0000 (07:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id9e2298a05893e3769f0e62bcda5fe70c058d11a
Auto-generated-cl: translation import
Geoff Mendal [Wed, 28 Oct 2015 14:10:50 +0000 (14:10 +0000)]
Import translations. DO NOT MERGE
am:
b8afc77c0a -s ours
* commit '
b8afc77c0a20a5d4ff7d1afb060c474feeefb1fe':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 13:59:45 +0000 (06:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: If7c4ccf382e85f88a4fac586ca870068d8219974
Auto-generated-cl: translation import
Daniel Sandler [Wed, 28 Oct 2015 03:23:27 +0000 (03:23 +0000)]
Merge "Petites fautes." into mnc-dr-dev
am:
da43cc0a21 -s ours
* commit '
da43cc0a2150a1c74340b75c919425e2a3f5b6fe':
Petites fautes.
Svetoslav [Tue, 27 Oct 2015 22:22:39 +0000 (15:22 -0700)]
Make SYSTEM_ALERT_WINDOW development permission
bug:
25329324
Change-Id: I0086464846bab9424764dd0d726692d96a0f1207
Daniel Sandler [Tue, 27 Oct 2015 19:51:31 +0000 (19:51 +0000)]
Merge "Petites fautes." into mnc-dr-dev
Dianne Hackborn [Tue, 27 Oct 2015 19:46:10 +0000 (19:46 +0000)]
Fix issue #
25289999: Lower device idle alarm limit to 10 mins.
am:
7682b26ea1
* commit '
7682b26ea164ba1078495e24910f22d73766c192':
Fix issue #
25289999: Lower device idle alarm limit to 10 mins.
Dan Sandler [Tue, 27 Oct 2015 17:42:55 +0000 (13:42 -0400)]
Petites fautes.
Bug:
25308153
Change-Id: I62ffe080e3f36eb685cdc06d8c106d32e18092ed
Dianne Hackborn [Tue, 27 Oct 2015 00:51:57 +0000 (17:51 -0700)]
Fix issue #
25289999: Lower device idle alarm limit to 10 mins.
This helps with some cases where perisistent network connections
need a more frequent keep alive signal. Actually make it 9
minutes to ensure that things needing a 10 minute cycle will
execute within that time.
Change-Id: Ife8c7b7f7f82b108d5a6c1624bd6115e6087c3be
Geoff Mendal [Mon, 26 Oct 2015 16:33:37 +0000 (16:33 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
14bb0511c6 -s ours
* commit '
14bb0511c6cc5ad62a870b3c2437c8090bcf75af':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 16:28:12 +0000 (16:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 26 Oct 2015 16:27:14 +0000 (11:27 -0500)]
Import translations. DO NOT MERGE
Change-Id: I0383c1869f289a39ca3db684712dbd812e626e9a
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 14:31:12 +0000 (14:31 +0000)]
Import translations. DO NOT MERGE
am:
f6fc9e2152 -s ours
* commit '
f6fc9e215292945ef3add558e513e5eef01acbfe':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:17:06 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9bf90d06113d8333bed3eec1c65ed799a785fb63
Auto-generated-cl: translation import
Puneet Kumar [Sat, 24 Oct 2015 15:42:38 +0000 (15:42 +0000)]
Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev
am:
ca9c43b27b
* commit '
ca9c43b27b9e3bc007e731fe3a214cbed3edf8f3':
Prevent recents from coming up when in SUW
Puneet Kumar [Sat, 24 Oct 2015 15:20:28 +0000 (15:20 +0000)]
Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev
Michael Wright [Sat, 24 Oct 2015 12:24:15 +0000 (13:24 +0100)]
Prevent recents from coming up when in SUW
Bug:
25229538
Change-Id: I141c4eb928a5ce7f9858922862fe3dc1d3a33a90
Dan Sandler [Sat, 24 Oct 2015 00:58:52 +0000 (00:58 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am:
1044e162c3 am:
b1de85487a -s ours am:
410bea181b am:
511357c39b am:
7e16b2e8f5 -s ours am:
e68e70d509
am:
493272c8a7
* commit '
493272c8a7e7219f947a222cd71aaaf3d4bc3c0a':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Sat, 24 Oct 2015 00:45:01 +0000 (00:45 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am:
1044e162c3 am:
b1de85487a -s ours am:
410bea181b am:
511357c39b am:
7e16b2e8f5 -s ours
am:
e68e70d509
* commit '
e68e70d509e2a0ba1c8bd56c231bf1c6cc3da967':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Sat, 24 Oct 2015 00:33:58 +0000 (00:33 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am:
51c2619c77 am:
6026b5b17e am:
6c3186ea07 -s ours am:
ab4857790b
am:
d9a96ff747
* commit '
d9a96ff7475a85ed60b42f96115db634e8c313cf':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Sat, 24 Oct 2015 00:33:48 +0000 (00:33 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am:
1044e162c3 am:
b1de85487a -s ours am:
410bea181b am:
511357c39b
am:
7e16b2e8f5 -s ours
* commit '
7e16b2e8f5b74d29711d330f6982d8ed12c3f4db':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Sat, 24 Oct 2015 00:15:49 +0000 (00:15 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am:
1044e162c3 am:
b1de85487a -s ours am:
410bea181b
am:
511357c39b
* commit '
511357c39b058b0d03beb175c1c35990729ee3d0':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Sat, 24 Oct 2015 00:15:44 +0000 (00:15 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am:
51c2619c77 am:
6026b5b17e am:
6c3186ea07 -s ours
am:
ab4857790b
* commit '
ab4857790bc84388817c0bec8c4010d660f35ada':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Sat, 24 Oct 2015 00:04:17 +0000 (00:04 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am:
51c2619c77 am:
6026b5b17e
am:
6c3186ea07 -s ours
* commit '
6c3186ea07a735d84e9a33e9864366b01f1f4c86':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Sat, 24 Oct 2015 00:04:06 +0000 (00:04 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am:
1044e162c3 am:
b1de85487a -s ours
am:
410bea181b
* commit '
410bea181b229adef7a2c1a9308379eead260706':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Fri, 23 Oct 2015 23:49:56 +0000 (23:49 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am:
446dcc9ed7
am:
4db8c18755
* commit '
4db8c187551bd238b50a85a7be3be6595a69a2ed':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Fri, 23 Oct 2015 23:49:56 +0000 (23:49 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am:
51c2619c77
am:
6026b5b17e
* commit '
6026b5b17e786c180909d8fe5f6747e446e1d365':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Fri, 23 Oct 2015 23:49:54 +0000 (23:49 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am:
1044e162c3
am:
b1de85487a -s ours
* commit '
b1de85487af1726c3d9e80d78bd643f550d9f3a4':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Fri, 23 Oct 2015 23:39:50 +0000 (23:39 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
am:
51c2619c77
* commit '
51c2619c7706575a171cf29819db14e91b815a62':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Fri, 23 Oct 2015 23:39:39 +0000 (23:39 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
am:
446dcc9ed7
* commit '
446dcc9ed7efa0b80ed7d353478326b2236f2cab':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Fri, 23 Oct 2015 23:39:22 +0000 (23:39 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
am:
1044e162c3
* commit '
1044e162c3dc4169b79112fc1a2de14757bca8c3':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
xin He [Fri, 23 Oct 2015 20:53:48 +0000 (20:53 +0000)]
Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev
am:
3b47afe765
* commit '
3b47afe7656eb16e8ddb04d771a18eab678c125f':
[DO NOT MERGE] EAP-TLS PMKID mismatch error
xin He [Fri, 23 Oct 2015 20:45:24 +0000 (20:45 +0000)]
Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev
xinhe [Wed, 21 Oct 2015 18:47:03 +0000 (11:47 -0700)]
[DO NOT MERGE] EAP-TLS PMKID mismatch error
b/
24253154
Change-Id: I45c770dc4769e74b668385dbc3a618d31a40dc7e
Adrian Roos [Fri, 23 Oct 2015 17:29:16 +0000 (17:29 +0000)]
Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
am:
93a6b4c129
* commit '
93a6b4c12904bd1804a540d006c183851b0aea33':
Revert "Revert "Track ashmem memory usage in Parcel""
Adrian Roos [Fri, 23 Oct 2015 17:21:23 +0000 (17:21 +0000)]
Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
Dianne Hackborn [Fri, 23 Oct 2015 17:09:45 +0000 (17:09 +0000)]
Merge "DO NOT MERGE Fix issue #
24118803: The screen doesn\'t turn off..." into mnc-dr-dev
am:
b32e020d23
* commit '
b32e020d237cfd94cdfe8c589900a899dc14413a':
DO NOT MERGE Fix issue #
24118803: The screen doesn't turn off...
Dianne Hackborn [Fri, 23 Oct 2015 17:04:55 +0000 (17:04 +0000)]
Merge "DO NOT MERGE Fix issue #
24118803: The screen doesn't turn off..." into mnc-dr-dev
Sungmin Choi [Fri, 23 Oct 2015 03:23:47 +0000 (03:23 +0000)]
Remove tether_apndata for Sasktel
am:
a665ea7207
* commit '
a665ea72075dbaa5a86f866ee6c8df5a80f1ced3':
Remove tether_apndata for Sasktel
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
Bug:
19121797
(cherry picked from commit
8fd25bf7711aabffe73213ba1f9056f285270695)
Change-Id: I14d9fb54521dc6d60822e7c683e4e92fd62cdc6a
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
(cherry picked from commit
8fd25bf7711aabffe73213ba1f9056f285270695)
Bug:
19121797
Change-Id: I7a5c12b371b735c756ca5a3e8716c385fb3fbfe9
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
Bug:
19121797
Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934
(cherry picked from commit
8fd25bf7711aabffe73213ba1f9056f285270695)
Adrian Roos [Thu, 22 Oct 2015 23:12:01 +0000 (16:12 -0700)]
Revert "Revert "Track ashmem memory usage in Parcel""
This reverts commit
e2adb2cf0f2c90c77fab3f09285a92e05e70b567.
Bug:
25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
Dianne Hackborn [Fri, 23 Oct 2015 00:40:23 +0000 (17:40 -0700)]
DO NOT MERGE Fix issue #
24118803: The screen doesn't turn off...
...after more than 60 minutes left
The sensing timeout alarm was being cancelled immediately after it
was scheduled it. Now only cancel it when we are done sensing or
have reset activity.
Change-Id: Id0440cda7dd1b81bf871f16dfb015df6284cf6af
Sungmin Choi [Fri, 16 Oct 2015 21:39:22 +0000 (14:39 -0700)]
Remove tether_apndata for Sasktel
Device has second APN (inet.stm.sk.ca) is being used for hot spot/tethered data.
SaskTel has moved to a single APN on devices (pda.stm.sk.ca).
BUG=
25064017
Change-Id: I5ba1f9e7c3b54cf8e8681a289693aba0ac584296
Ian Pedowitz [Thu, 22 Oct 2015 22:32:40 +0000 (22:32 +0000)]
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
am:
09fd4ecf90
* commit '
09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
Revert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:26:32 +0000 (22:26 +0000)]
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
Ian Pedowitz [Thu, 22 Oct 2015 22:08:07 +0000 (22:08 +0000)]
Revert "Track ashmem memory usage in Parcel"
This reverts commit
ab3f9724035046d65124a72db2a09c824b3d5c67.
Bug:
25169267
Bug:
25191602
Bug:
25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
Nicolas Prévot [Thu, 22 Oct 2015 20:35:18 +0000 (20:35 +0000)]
Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev
am:
6666b29cf7
* commit '
6666b29cf7c5ddaeae3d66606a9982f7c5cc8686':
Don't resolve cross-profile app links without intent picker.
Nicolas Prévot [Thu, 22 Oct 2015 20:29:51 +0000 (20:29 +0000)]
Merge "Don't resolve cross-profile app links without intent picker." into mnc-dr-dev
Dmitry Torokhov [Thu, 22 Oct 2015 18:13:37 +0000 (18:13 +0000)]
SystemUI: fix automatic pairing of BT keyboards
am:
79f00cf06f
* commit '
79f00cf06f5e70047d73b48d20910b967353b075':
SystemUI: fix automatic pairing of BT keyboards
Dmitry Torokhov [Thu, 22 Oct 2015 17:07:53 +0000 (10:07 -0700)]
SystemUI: fix automatic pairing of BT keyboards
After reset (docking) Pixel C Keyboard that was previously paired with
a device goes into so-called non-discoverable mode, where it will
establish connection only with device that it has connected before. When
scanning for available devices we need to wait till the keyboard starts
advertising itself as discoverable, and only then try to pair.
Also, let's flush the device cache when we attach the base to make sure
the device that we seen before and cached again in the right state after
reset.
Bug:
24915541
Change-Id: I136c1c4235080a25529b4b1c2b1da9bc18508811
Nicolas Prevot [Thu, 22 Oct 2015 13:55:26 +0000 (14:55 +0100)]
Don't resolve cross-profile app links without intent picker.
If ALLOW_CROSS_PROFILE_APP_LINKING has been set:
If there is an app with status always across profiles, and some
apps without status always in the current profile: show an intent
picker instead of directly resolving across profiles.
BUG:
25109215
Change-Id: I74a67d231284ce912121ea0818109fbf904183e8
Yoshiki Iguchi [Thu, 22 Oct 2015 07:39:18 +0000 (07:39 +0000)]
Fix crash on calling removeSelection with showing selection handlers
am:
9582e15196
* commit '
9582e151964be60457d4abd712857fb1e8a4586d':
Fix crash on calling removeSelection with showing selection handlers
Yoshiki Iguchi [Thu, 15 Oct 2015 04:34:41 +0000 (13:34 +0900)]
Fix crash on calling removeSelection with showing selection handlers
A crash occured on updating after calling removeSelection with showing
selection handlers. This was because some selection-handler code didn't
consider the case the selection index was -1 (-1 means there is no selection).
This patch fixes this crash.
Bug:
23299977
Change-Id: I736d315e073f773aec597522203015205a8da42b
Lorenzo Colitti [Thu, 22 Oct 2015 06:18:45 +0000 (06:18 +0000)]
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
am:
809dcade99
* commit '
809dcade9906001f6aa51a68aa783e20bb1d7c0d':
Reinstate CHANGE_NETWORK_STATE as a normal permission.
OSDN Git Service
