OSDN Git Service
Jeff Sharkey [Fri, 2 Dec 2016 02:02:58 +0000 (02:02 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca am:
ee8e0e8ae3 am:
f70dd1fbc1 -s ours am:
60f17b8505 am:
ca44afff8a am:
f2688ddcb7
am:
f5ab66fd9a
Change-Id: I9436de1d1af63c14e63c5e6ef10e36ce8cc23288
Jeff Sharkey [Fri, 2 Dec 2016 02:01:48 +0000 (02:01 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am:
32d2b4c7af -s ours am:
18ade37c6b am:
05318c125f am:
68979dd543
am:
4529abc0f7
Change-Id: I344a012ddf84b2cdee290ab5c2fb055b50013248
Jeff Sharkey [Fri, 2 Dec 2016 02:00:46 +0000 (02:00 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours am:
d9a7f11334 am:
2436f1e49d am:
90efb1a88d
am:
25a7e0e952
Change-Id: Ie15abbf00fd5c64a56a8635c1948146d5ae88be5
Jeff Sharkey [Fri, 2 Dec 2016 01:59:39 +0000 (01:59 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours am:
e94d76436b am:
40b4b1f774 am:
ced9dde8c0
am:
18f2836082
Change-Id: Ic89cad34d2c4a1cd8590c89c6c9d1f0a32b149c3
Jeff Sharkey [Fri, 2 Dec 2016 01:51:04 +0000 (01:51 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca am:
ee8e0e8ae3 am:
f70dd1fbc1 -s ours am:
60f17b8505 am:
ca44afff8a
am:
f2688ddcb7
Change-Id: Ibdbf06398dc508b01561b912bdbcb1b419965b4d
Jeff Sharkey [Fri, 2 Dec 2016 01:49:54 +0000 (01:49 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am:
32d2b4c7af -s ours am:
18ade37c6b am:
05318c125f
am:
68979dd543
Change-Id: I451cba0003a6dbea88d718c332971386c539dad7
Jeff Sharkey [Fri, 2 Dec 2016 01:48:50 +0000 (01:48 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours am:
d9a7f11334 am:
2436f1e49d
am:
90efb1a88d
Change-Id: I7dd6a4396691429ba66cefb136c6176db62da010
Jeff Sharkey [Fri, 2 Dec 2016 01:47:37 +0000 (01:47 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours am:
e94d76436b am:
40b4b1f774
am:
ced9dde8c0
Change-Id: I00217abf1fb1f9f772547250d24dc30ea78c6683
Jeff Sharkey [Fri, 2 Dec 2016 01:39:49 +0000 (01:39 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca am:
ee8e0e8ae3 am:
f70dd1fbc1 -s ours am:
60f17b8505
am:
ca44afff8a
Change-Id: I7317621b2b33749792826e296b99dab1f5bed203
Jeff Sharkey [Fri, 2 Dec 2016 01:38:37 +0000 (01:38 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am:
32d2b4c7af -s ours am:
18ade37c6b
am:
05318c125f
Change-Id: I858364149ce1ec4dd796d7bc52c5b82099ba55b0
Jeff Sharkey [Fri, 2 Dec 2016 01:37:36 +0000 (01:37 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours am:
d9a7f11334
am:
2436f1e49d
Change-Id: I0dd664960ca4b08b1a21ccb0139c9354c56c7cd5
Jeff Sharkey [Fri, 2 Dec 2016 01:36:30 +0000 (01:36 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours am:
e94d76436b
am:
40b4b1f774
Change-Id: If2dc11e8db8deb1f432f853aeed013d9d554c8f5
Jeff Sharkey [Fri, 2 Dec 2016 01:36:25 +0000 (01:36 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be am:
b981c3be70 -s ours am:
a24a33490a am:
dd32a67b33 am:
a898d9f6ca
am:
94a2dd9354
Change-Id: Ifdabb564f8aabbf484642f676a0d93eea8ae3002
Jeff Sharkey [Fri, 2 Dec 2016 01:28:44 +0000 (01:28 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca am:
ee8e0e8ae3 am:
f70dd1fbc1 -s ours
am:
60f17b8505
Change-Id: I10b4a404deb98692a372df001b5af742f84f9d06
Jeff Sharkey [Fri, 2 Dec 2016 01:27:34 +0000 (01:27 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am:
32d2b4c7af -s ours
am:
18ade37c6b
Change-Id: I374cd53de7cc8e68b2605f2edc9cf595d1119c3e
Jeff Sharkey [Fri, 2 Dec 2016 01:26:32 +0000 (01:26 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours
am:
d9a7f11334
Change-Id: I8b47e258124e4be1b4067712a7cbabb9b7c82a8a
Jeff Sharkey [Fri, 2 Dec 2016 01:25:28 +0000 (01:25 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours
am:
e94d76436b
Change-Id: Ice97dfb650bafe8fff720db26fcdc6f1db60037e
Jeff Sharkey [Fri, 2 Dec 2016 01:24:41 +0000 (01:24 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be am:
b981c3be70 -s ours am:
a24a33490a am:
dd32a67b33
am:
a898d9f6ca
Change-Id: Ia3add5aa2d68c32b293e82712d59dc439121fb01
Jeff Sharkey [Fri, 2 Dec 2016 01:18:49 +0000 (01:18 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca am:
ee8e0e8ae3
am:
f70dd1fbc1 -s ours
Change-Id: Ie3be31b7010a3fae500b547fde31056084b3e2b7
Jeff Sharkey [Fri, 2 Dec 2016 01:18:32 +0000 (01:18 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be am:
b981c3be70 -s ours am:
a24a33490a
am:
dd32a67b33
Change-Id: I2d8b2894d07f7f6173e979d7eb656e9ac860f06a
Jeff Sharkey [Fri, 2 Dec 2016 01:14:27 +0000 (01:14 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev
am:
32d2b4c7af -s ours
Change-Id: Id4cf3526f7892971e4f226e98036166cbe8d28ef
Jeff Sharkey [Fri, 2 Dec 2016 01:14:23 +0000 (01:14 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
f084ccd48d -s ours
Change-Id: I9b4630b18d52ad503b88380c1a853bf3c0b46a10
Jeff Sharkey [Fri, 2 Dec 2016 01:13:18 +0000 (01:13 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4
am:
50102e63da -s ours
Change-Id: I3a587cb124b30ef5062600e7ba870da58213a094
Jeff Sharkey [Fri, 2 Dec 2016 01:13:13 +0000 (01:13 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca
am:
ee8e0e8ae3
Change-Id: I24fd90b2e61aabe95ccc5891c02fbbe2c795ba18
Jeff Sharkey [Fri, 2 Dec 2016 01:13:09 +0000 (01:13 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be am:
b981c3be70 -s ours
am:
a24a33490a
Change-Id: I8564b110d58f63aeee8afeab87773e97b7301a60
TreeHugger Robot [Fri, 2 Dec 2016 01:10:32 +0000 (01:10 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev
Jeff Sharkey [Fri, 2 Dec 2016 01:07:07 +0000 (01:07 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be
am:
b981c3be70 -s ours
Change-Id: I22fe97ae93c6e665288d46c29429ca7690352fb3
Jeff Sharkey [Fri, 2 Dec 2016 01:06:56 +0000 (01:06 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b
am:
061e7313b4
Change-Id: If0723e8cb1484263a3b96b37d21132d2ebc9b1b5
Jeff Sharkey [Fri, 2 Dec 2016 01:06:56 +0000 (01:06 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723
am:
af5f47caca
Change-Id: Idc1de786eee9966a0d555affdb2ac41fa134eb55
Jeff Sharkey [Fri, 2 Dec 2016 01:01:51 +0000 (01:01 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours
am:
1da786d723
Change-Id: I09b766396a8334551917723a47d5bba2590cb2bd
Jeff Sharkey [Fri, 2 Dec 2016 01:01:49 +0000 (01:01 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220
am:
2d549764be
Change-Id: Iad255e684d36524388a659181da0535bd15e37dc
Jeff Sharkey [Fri, 2 Dec 2016 01:01:49 +0000 (01:01 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3
am:
3e0d93036b
Change-Id: Ice0b80b96cdd7ad1a7691919982d98266a37f8bf
Jeff Sharkey [Fri, 2 Dec 2016 00:56:36 +0000 (00:56 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2
am:
b9a0b79675 -s ours
Change-Id: I82040d83bc780656b5deaa4fbe664700567e2138
Jeff Sharkey [Fri, 2 Dec 2016 00:56:31 +0000 (00:56 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
3b0aa060a3
Change-Id: I3ba9a8dedfda4d878b99cc7de8a41418d424495c
Jeff Sharkey [Fri, 2 Dec 2016 00:56:26 +0000 (00:56 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
fbf395c220
Change-Id: I453445723ea9f6124d876dc32c6defab42432351
Jeff Sharkey [Fri, 2 Dec 2016 00:50:29 +0000 (00:50 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
1de465bec2
Change-Id: I14f82fa9c555bea0e71553713436a6836a421691
TreeHugger Robot [Fri, 2 Dec 2016 00:31:10 +0000 (00:31 +0000)]
Merge "DO NOT MERGE Show keyguard when SIM is removed" into nyc-mr2-dev
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Adrian Roos [Mon, 28 Nov 2016 23:46:06 +0000 (15:46 -0800)]
DO NOT MERGE Show keyguard when SIM is removed
If the device has a secure lockscreen and the device'
SIM card is removed, lock the device.
Change-Id: I0369af81297169d65254b85bc9a056e4f4a02b7b
Merged-In: I5b0deea8851b38781059732a3cf6fa0a4a00e3ca
Fixes:
30997251
Julius D'souza [Thu, 1 Dec 2016 22:35:42 +0000 (22:35 +0000)]
Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev
am:
afccacad68
Change-Id: I9b6870028ce598c4c9066031c4706dbb0555c38d
Julius D'souza [Thu, 1 Dec 2016 22:35:39 +0000 (22:35 +0000)]
DO NOT MERGE: Sync with master: Add initial ambient light sensor rate
am:
5c7ae14148
Change-Id: I5020bc4caba313eda5b7a8b2bdcf3e9f348b2f95
Julius D'souza [Thu, 1 Dec 2016 22:26:02 +0000 (22:26 +0000)]
Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev
Makoto Onuki [Thu, 1 Dec 2016 20:47:06 +0000 (20:47 +0000)]
Merge "Fix issue with apps restored to lower versions." into nyc-mr2-dev
Jorim Jaggi [Mon, 28 Nov 2016 13:03:11 +0000 (14:03 +0100)]
Fix deadzone in seascape orientation
Test: Enable config_dead_zone_flash, make sure deadzone gets drawn
on the right side in seascape/landscape/portrait and deadzone is
consuming clicks on the right side.
Change-Id: Icc88967cfa7bf8ba7f6f3b797ca001eba78e5cdc
Fixes:
32870901
(cherry picked from commit
7aaa3d7d196c5afac4c54de44f5b7728a9a16d1b)
Michael Kwan [Thu, 1 Dec 2016 02:53:02 +0000 (02:53 +0000)]
Merge "Change exit animation to use normal z-order." into cw-f-dev
am:
6abcefd350
Change-Id: Ib5b10147cb8124adb44a1f46a4e6cc68085719a9
Michael Kwan [Thu, 1 Dec 2016 02:52:58 +0000 (02:52 +0000)]
Change exit animation to use normal z-order.
am:
a562fe4a23
Change-Id: Ieacdc633ae77c445b091f8d8e56ff30733e8fb00
TreeHugger Robot [Thu, 1 Dec 2016 02:43:32 +0000 (02:43 +0000)]
Merge "Change exit animation to use normal z-order." into cw-f-dev
Mark Renouf [Thu, 1 Dec 2016 01:34:22 +0000 (01:34 +0000)]
Merge "Allow power button to close an input method" into cw-f-dev
am:
33d498b946
Change-Id: I627188ee2622c30d8f65debe7c350c1c25309acf
Mark Renouf [Thu, 1 Dec 2016 01:29:31 +0000 (01:29 +0000)]
Allow power button to close an input method
am:
d28e907183
Change-Id: I26176ab20b90ca2c5d286b3f34bfacc6527018b5
Michael Kwan [Wed, 30 Nov 2016 21:53:37 +0000 (13:53 -0800)]
Change exit animation to use normal z-order.
Bug:
33198426
Change-Id: I57f2f6360c165fbea25adf9b43f052e09261364b
Mark Renouf [Thu, 1 Dec 2016 01:16:53 +0000 (01:16 +0000)]
Merge "Allow power button to close an input method" into cw-f-dev
Doris Liu [Tue, 29 Nov 2016 21:04:49 +0000 (13:04 -0800)]
Fix LUTInterpolator lookup table position calc
BUG:
32830741
Test: running progress bar at 5x duration scale, no flickering
Change-Id: Ie484bdbfdf18bacc4586e36c5142e4523d08bdaa
Michael Kwan [Wed, 30 Nov 2016 22:46:39 +0000 (22:46 +0000)]
Merge "Change activity dismiss animation to move left to right." into cw-f-dev
am:
d950da334e
Change-Id: I4351679158589609552f876f58d742cb7ab6bfb8
Michael Kwan [Wed, 30 Nov 2016 22:46:36 +0000 (22:46 +0000)]
Change activity dismiss animation to move left to right.
am:
6d969ea4d8
Change-Id: Iac5bd40013717384fa972c30058ac455b47d1bef
TreeHugger Robot [Wed, 30 Nov 2016 22:39:02 +0000 (22:39 +0000)]
Merge "Change activity dismiss animation to move left to right." into cw-f-dev
vinodkrishnan [Wed, 30 Nov 2016 21:55:30 +0000 (21:55 +0000)]
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev
am:
a0d9383f71
Change-Id: Ief5e84e70df321b27de7a67cb0ee29641b9ae0b4
vinodkrishnan [Wed, 30 Nov 2016 21:52:05 +0000 (21:52 +0000)]
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"
am:
7b62df8556
Change-Id: Iec37684da3fa447d55498e6c8302fb229fa28373
TreeHugger Robot [Wed, 30 Nov 2016 21:43:34 +0000 (21:43 +0000)]
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev
Mark Renouf [Tue, 29 Nov 2016 19:41:50 +0000 (14:41 -0500)]
Allow power button to close an input method
BUG:
33038203
Change-Id: I5c44dc49db6b960b4e3e42545bfbbab62f357f08
Michael Kwan [Wed, 30 Nov 2016 20:19:36 +0000 (12:19 -0800)]
Change activity dismiss animation to move left to right.
Bug:
33041168
Change-Id: Idf3d512debead3b3c70bc2bb8b38b133f2ad1723
vinodkrishnan [Wed, 30 Nov 2016 20:09:59 +0000 (20:09 +0000)]
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"
This reverts commit
8500f26d51e2ba0de7b6cd18bec5f85e5ca40e1d.
Change-Id: I6408fa3f307d7611443e26b24d3876c1a1f92fdc
Phil Weaver [Wed, 30 Nov 2016 17:51:37 +0000 (17:51 +0000)]
Merge "Don't invalidate list data during layout." into nyc-mr2-dev
Anthony Hugh [Wed, 30 Nov 2016 03:28:39 +0000 (03:28 +0000)]
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev
am:
75bf81458e
Change-Id: If636be95a72d30ef643b66add737f77c5cbdf8d9
Anthony Hugh [Wed, 30 Nov 2016 03:28:34 +0000 (03:28 +0000)]
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback
am:
f73d085395
Change-Id: I9cee73a7146ff97dcc7f82447f06281f71bc2466
TreeHugger Robot [Wed, 30 Nov 2016 03:09:20 +0000 (03:09 +0000)]
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev
Pankaj Kanwar [Wed, 30 Nov 2016 00:33:33 +0000 (00:33 +0000)]
Merge "Allow Carriers to specify Wifi Networks." into nyc-mr2-dev
Anthony Hugh [Tue, 22 Nov 2016 23:13:35 +0000 (15:13 -0800)]
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback
It looks like there was a regression where #onNewIntent() was called
before the FLAG_ACTIVITY_BROUGHT_TO_FRONT flag was set. This
change updates the code so we set the flag properly.
BUG:
33034247
Change-Id: I61959a289dc5af14ee9d3d7bfa213191238efc88
Jorim Jaggi [Mon, 28 Nov 2016 13:47:45 +0000 (14:47 +0100)]
Let lock icon reappear after fingerprint draw off
Test: Unlock with fingerprint, observe icon
Test: Unlock with fingerprint while collapsing panel, make sure
icon reappears after 800ms.
Change-Id: I8b081445bdaaa68741e4bab57a6f79f6e12f1d54
Fixes:
30507748
(cherry picked from commit
8dea48c87e2f3792732533ed4a28bb724f8106a7)
pkanwar [Wed, 23 Nov 2016 19:20:30 +0000 (11:20 -0800)]
Allow Carriers to specify Wifi Networks.
Bug:
31003437
Change-Id: I661f8fc9924e677b9ac08c70500bd175d30834fa
Rubin Xu [Fri, 25 Nov 2016 18:24:55 +0000 (18:24 +0000)]
Fix boot loop when upgrading direclty from L to N am:
bfc7faaf35
am:
492f5263a4
Change-Id: I62f538737c1946aae3fb64555d425c379340bef1
Rubin Xu [Fri, 25 Nov 2016 18:20:48 +0000 (18:20 +0000)]
Fix boot loop when upgrading direclty from L to N
am:
bfc7faaf35
Change-Id: Iaaf32f1c6fd70dd394252f963d87897899fb2e55
Mark Renouf [Wed, 23 Nov 2016 19:33:44 +0000 (19:33 +0000)]
Disables swipe-to-dismiss windows for input methods on Wear
am:
5514d77e7d
Change-Id: I75954a8a10bd5c18446bc38a742e3a6175c26df3
Mark Renouf [Tue, 22 Nov 2016 22:48:59 +0000 (17:48 -0500)]
Disables swipe-to-dismiss windows for input methods on Wear
BUG:
33086263
Change-Id: I77ed17602cee2cf08f5265a60a1d7654e6e23960
Rubin Xu [Tue, 22 Nov 2016 15:18:32 +0000 (15:18 +0000)]
Fix boot loop when upgrading direclty from L to N
A second attempt to fix the upgrade problem due to SID == 0
in the above upgrade path. The previous fix contains a bug
where it would cause future attempts to unify work challenge
to silently fail, and crash SystemUi when unlocking.
This fix adds a check for non-zero SID before doing the initial work
profile unification (which caused the upgrade crash when SID == 0).
This means the initial work profile unification would only happen when
the user has unlocked the lockscreen and SID is generated.
Bug:
32490092
Bug:
33050562
Change-Id: Ib28951b2ec26b4f091df7763d9902f55616fcb5c
Zach Jang [Tue, 22 Nov 2016 18:04:13 +0000 (18:04 +0000)]
Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev am:
d427da8a24
am:
466bb400bb
Change-Id: I49c4ed53cb2341d34855d53f5e66a95a7c0130af
Zach Jang [Tue, 22 Nov 2016 18:03:27 +0000 (18:03 +0000)]
Revert "Catch KeyStoreException for setting profile lock" am:
e61672ab08
am:
fe3b0b2cc1
Change-Id: Iba7288ba01872f804a22814f4615b202010d7194
Zach Jang [Tue, 22 Nov 2016 17:59:02 +0000 (17:59 +0000)]
Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev
am:
d427da8a24
Change-Id: I8a4f01466e4b93782478e94240f2c8f2d74972ad
Zach Jang [Tue, 22 Nov 2016 17:58:58 +0000 (17:58 +0000)]
Revert "Catch KeyStoreException for setting profile lock"
am:
e61672ab08
Change-Id: Ie1a720181bf542bbf213af8b6b83eff0ecd84a98
Zach Jang [Tue, 22 Nov 2016 17:51:57 +0000 (17:51 +0000)]
Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev
Zach Jang [Tue, 22 Nov 2016 17:47:18 +0000 (17:47 +0000)]
Revert "Catch KeyStoreException for setting profile lock"
This reverts commit
c8fa5ed8f2d492aa5e005fcdb5991c3f980de045.
Change-Id: Ia1425e649e102cb79280d75e5f49db670214cec3
Makoto Onuki [Mon, 21 Nov 2016 21:41:32 +0000 (13:41 -0800)]
Fix issue with apps restored to lower versions.
When restoring to a new device, if a restored app is not compatible
with the old version (e.g. lower version or different signature),
then we won't restore shortcuts, which is working as expected.
However when it happens, the shortcut manager forgot to "un-shadow"
the package information, causing the app to not have shortcuts at all.
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Bug
32999759
Change-Id: I89832360114de0ce1c57d763bcaccab4fdb87b6d
Nancy Zheng [Mon, 21 Nov 2016 18:19:53 +0000 (18:19 +0000)]
Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev
am:
f9154e923b
Change-Id: I554442be467ad618d02e5f8f3199d57c45d7b972
Nancy Zheng [Mon, 21 Nov 2016 18:19:48 +0000 (18:19 +0000)]
Fix createConfirmDeviceCredentialIntent for wear for CTS.
am:
43f166dfb4
Change-Id: Icda6d5182ff20c4db150ae3f0351e559682184de
Nancy Zheng [Mon, 21 Nov 2016 18:13:03 +0000 (18:13 +0000)]
Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev
Nancy Zheng [Sat, 19 Nov 2016 02:15:09 +0000 (18:15 -0800)]
Fix createConfirmDeviceCredentialIntent for wear for CTS.
Bug:
33000237
Change-Id: I1fdb5a518c41ab005f12d3142763e374b38d7553
Michael Kwan [Sat, 19 Nov 2016 00:12:12 +0000 (00:12 +0000)]
Fix default dialog background colour for watch devices.
am:
56c25af274
Change-Id: I5020e61d35adf3327f4b0e39e5e3e74188392330
Michael Kwan [Fri, 18 Nov 2016 23:02:43 +0000 (15:02 -0800)]
Fix default dialog background colour for watch devices.
Bug:
33008587
Change-Id: I0fe4f9a7244958406d2a3466393476f7775ae995
Marie Janssen [Wed, 9 Nov 2016 20:01:24 +0000 (12:01 -0800)]
Bluetooth: BLE app tracking fixes
Simplify tracking registered BLE Apps and clear the state when we
try to recover bluetooth from starting to ON.
Test: enable and disable bluetooth an LE-only app running
Bug:
32609235
Change-Id: I3233bf8402a3c8fc4886ef21b1e9411bc78d4e2c
TreeHugger Robot [Fri, 18 Nov 2016 19:59:40 +0000 (19:59 +0000)]
Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." into nyc-mr2-dev
Erik Wolsheimer [Fri, 18 Nov 2016 19:24:32 +0000 (19:24 +0000)]
Merge "Enable swipe to dismiss for watch devices." into cw-f-dev
am:
d841ee9c81
Change-Id: Ic2bd153e8ba12b6e4aff380c20c7ecf5dea09791
Michael Kwan [Fri, 18 Nov 2016 19:24:27 +0000 (19:24 +0000)]
Enable swipe to dismiss for watch devices.
am:
686de42711
Change-Id: I3f9b9dcf8f7094bcf59eec643a5f87922486371e
Erik Wolsheimer [Fri, 18 Nov 2016 19:17:53 +0000 (19:17 +0000)]
Merge "Enable swipe to dismiss for watch devices." into cw-f-dev
Felipe Leme [Wed, 17 Aug 2016 20:39:10 +0000 (13:39 -0700)]
DO NOT MERGE ANYWHERE - Clear preferences when package is removed.
(cherry pick of commits
2154caf2f80fa87df84813b8e344f85094a454fd and
da1fc0a9c23697cc255efdccc47862bd1277da3f).
Change-Id: I5a019d771da6ff52ea36ee683a44405f6ea24853
Bug:
30900628
Bug:
28722556
Fixes:
32972310
(cherry picked from commit
20488d97cdc9aa7e98f6fd75c2890ba18781654a)
Scott Main [Fri, 18 Nov 2016 15:42:08 +0000 (15:42 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359 am:
c8b11fb7cb am:
192a8c4973 am:
97be8864e5
am:
ec9f41356c
Change-Id: I7cd3a82a73707b1f61c82897c0e7fbc63f33d226
Scott Main [Fri, 18 Nov 2016 15:36:33 +0000 (15:36 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359 am:
c8b11fb7cb am:
192a8c4973
am:
97be8864e5
Change-Id: I340207420e0811c74751a96dc30e929a411ea207
Scott Main [Fri, 18 Nov 2016 15:30:06 +0000 (15:30 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359 am:
c8b11fb7cb
am:
192a8c4973
Change-Id: Ib54b2bafcf87a4f27e6a541a4cde0b01c41780b0
Scott Main [Fri, 18 Nov 2016 15:24:18 +0000 (15:24 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359
am:
c8b11fb7cb
Change-Id: I6db78aa2008d2bdd675a87daeae132e5f5c09371
OSDN Git Service
