OSDN Git Service
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:22 +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
Jeff Sharkey [Mon, 2 Nov 2015 17:51:53 +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:17 +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
Anthony Hugh [Fri, 30 Oct 2015 20:04:10 +0000 (20:04 +0000)]
Merge "Add intent extra for determining if apps are system apps" into cw-e-dev
Pavel Zhamaitsiak [Fri, 30 Oct 2015 14:26:51 +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
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:51 +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:30:59 +0000 (21:30 +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:38 +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
Geoff Mendal [Thu, 29 Oct 2015 19:14:06 +0000 (12:14 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25319151
Change-Id: Ie6489b1bcab3dc453d04a200028d407dab17c8fa
Lorenzo Colitti [Thu, 29 Oct 2015 08:02:31 +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
Bryce Lee [Thu, 29 Oct 2015 07:10:15 +0000 (07:10 +0000)]
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-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
Bryce Lee [Thu, 29 Oct 2015 05:21:54 +0000 (22:21 -0700)]
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
Bug:
25332357
Change-Id: I942ac0dea3e4f8580c44e027a570d0b59822a257
Bryce Lee [Thu, 29 Oct 2015 05:04:06 +0000 (05:04 +0000)]
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev
Bryce Lee [Thu, 29 Oct 2015 04:58:38 +0000 (04:58 +0000)]
Revert "Declare new interface for headset client bluetooth profile to query."
This reverts commit
694251eaaa8ea70a9b0427d55e9ede437c83a6d5.
Change-Id: I588206d8aedb96254c27494dddb32ddc3b6ea0ea
Bryce Lee [Thu, 29 Oct 2015 04:39:08 +0000 (04:39 +0000)]
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev
Bryce Lee [Thu, 29 Oct 2015 04:06:27 +0000 (21:06 -0700)]
Declare new interface for headset client bluetooth profile to query.
This is needed in order to allow implementations of the HFP HF side to
define when audio can be routed to the device. This allows for calls dialed
from an AG to be kept on the AG if desired.
Bug:
25332357
Change-Id: I35a554cfc53f88c7dd3059bf52df5c69df9c7415
Svetoslav Ganov [Thu, 29 Oct 2015 01:16:46 +0000 (01:16 +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
Anthony Hugh [Wed, 28 Oct 2015 18:22:41 +0000 (18:22 +0000)]
Merge "Update permission label strings" into cw-e-dev
Ching Tzung Lin [Wed, 28 Oct 2015 17:25:24 +0000 (17:25 +0000)]
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
Geoff Mendal [Wed, 28 Oct 2015 14:43:38 +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:22:47 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 28 Oct 2015 14:21:49 +0000 (07:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9c1726898d50ea8971a12ddc9fe575615682f95d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 28 Oct 2015 14:11:00 +0000 (14:11 +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
Geoff Mendal [Wed, 28 Oct 2015 12:13:26 +0000 (05:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0fba6c467156c09874291320bf9f18d13e4ba466
Auto-generated-cl: translation import
Svetoslav [Tue, 27 Oct 2015 22:22:39 +0000 (15:22 -0700)]
Make SYSTEM_ALERT_WINDOW development permission
bug:
25329324
Change-Id: I0086464846bab9424764dd0d726692d96a0f1207
Anthony Hugh [Tue, 27 Oct 2015 21:13:42 +0000 (14:13 -0700)]
Update permission label strings
Updates permission labels to have more consistent
grammar and capitalization.
BUG:
23760467
Change-Id: I61c2f9c72fdf4318e1773f3e0385fb86e0d65f69
Daniel Sandler [Tue, 27 Oct 2015 20:00:01 +0000 (20:00 +0000)]
Merge "Petites fautes." into mnc-dr-dev
am:
da43cc0a21
* commit '
da43cc0a2150a1c74340b75c919425e2a3f5b6fe':
Petites fautes.
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:12 +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
Anthony Hugh [Tue, 27 Oct 2015 00:47:05 +0000 (17:47 -0700)]
Add intent extra for determining if apps are system apps
This is being added to help identify system apps so that
the UI can filter on that type.
BUG:
24955055
Change-Id: Ie4be3717ce997f60eeb48a389c0f54ce5803141a
Geoff Mendal [Mon, 26 Oct 2015 19:36:01 +0000 (19:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 19:35:20 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 19:35:02 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 19:06:21 +0000 (12:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic500efe78e3dd02f8dd74b8c687443bbe559355b
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 19:04:18 +0000 (12:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I07f75df116b723529d96cacf5ac8431caafb022d
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 19:02:09 +0000 (12:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ecfe0ecad2b5aa88fc4b60d6d5f8e718ec19bcf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 18:59:41 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 18:59:25 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 18:59:13 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 18:49:23 +0000 (11:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8a0b74d374b31531c37be9b0d8bc251300a82009
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 18:43:00 +0000 (11:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia70d07e17335f2a77a0c66ff9fb906e6f6f70171
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 18:40:53 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I19a669e57b0264602c1daa8703caa8ac506a6cd7
Auto-generated-cl: translation import
Bryce Lee [Mon, 26 Oct 2015 17:08:49 +0000 (17:08 +0000)]
Merge "Add Telecom config bool to require a phone account to be present for handle" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 16:57:30 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 16:53:50 +0000 (11:53 -0500)]
Import translations. DO NOT MERGE
Change-Id: I3b8c2defeead0f1a68f261eaa271e7a316130627
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 16:33:36 +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
Geoff Mendal [Mon, 26 Oct 2015 12:11:27 +0000 (05:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iafffd8db9db17c15f46c82ba641c6f6ad83d4059
Auto-generated-cl: translation import
Bryce Lee [Mon, 26 Oct 2015 05:27:10 +0000 (22:27 -0700)]
Add Telecom config bool to require a phone account to be present for handle
Bug:
25202039
Change-Id: I83f6a72ed78fd22bddc7be46d24af33781a65f6e
Puneet Kumar [Sat, 24 Oct 2015 15:42:33 +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:58 +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: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:33:33 +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: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:
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:49:43 +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: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
Ching Tzung Lin [Fri, 23 Oct 2015 20:07:30 +0000 (13:07 -0700)]
Consolidates config_windowOutsetBottom and circular_display_mask_offset
Three phases involved:
phase 1: change all code references to circurlar_display_mask_offset to
config_windowOutsetBottom, and mark circular_display_mask_offset
deprecated.
phase 2: remove circular_display_mask_offset from device overlays
phase 3: remove circular_display_mask_offset symbol and default setting.
Bug:
25220421
Change-Id: Ia3f77610dbbb964eb58c6b28f6206799d56c44c2
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
Bryce Lee [Fri, 23 Oct 2015 20:52:44 +0000 (20:52 +0000)]
Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev
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
Bryce Lee [Fri, 23 Oct 2015 19:32:07 +0000 (12:32 -0700)]
Add config flag for reloading supported profiles in bluetooth on enable.
Bug:
24977590
Change-Id: I9aa0db5f5488f1ad400f3c0be7d8055ed36725dc
Ching Tzung Lin [Fri, 23 Oct 2015 18:05:52 +0000 (18:05 +0000)]
Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev
Adrian Roos [Fri, 23 Oct 2015 17:29:13 +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...
OSDN Git Service
