OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev...
Jeff Sharkey [Fri, 2 Dec 2016 02:39:33 +0000 (02:39 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am: 73b49fc7e8 am: 8c456f7f39 am: 5902fdad90
am: f906cf3102

Change-Id: I2ee7d96ea30b79b06f309fd6c9a0f00be1845110

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2 am...
Jeff Sharkey [Fri, 2 Dec 2016 02:38:28 +0000 (02:38 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2 am: bc7aae3610 am: 0d774967ba
am: 7b1ae648a4

Change-Id: Ic41686d29064a35663dedf07d6e016f5f7522758

7 years agoMerge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev...
Jeff Sharkey [Fri, 2 Dec 2016 02:26:28 +0000 (02:26 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am: 73b49fc7e8 am: 8c456f7f39
am: 5902fdad90

Change-Id: Ia298b5408374d17ac37e6d9e0e9f2b26a637098f

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2 am...
Jeff Sharkey [Fri, 2 Dec 2016 02:25:28 +0000 (02:25 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2 am: bc7aae3610
am: 0d774967ba

Change-Id: Ie4d4800ab930a9ae19ba1f614edd876b79c29faf

7 years agoMerge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev...
Jeff Sharkey [Fri, 2 Dec 2016 02:19:50 +0000 (02:19 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am: 73b49fc7e8
am: 8c456f7f39

Change-Id: I26ad39aa405aa08fce0b26ef183678d08667ac04

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2
Jeff Sharkey [Fri, 2 Dec 2016 02:18:58 +0000 (02:18 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2
am: bc7aae3610

Change-Id: Ica4ff267ef7078a5351e41c3af08614eb65907f8

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s...
Jeff Sharkey [Fri, 2 Dec 2016 02:12:07 +0000 (02:12 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d  -s ours am: 704085119d am: 8bd3aa70ad  -s ours am: 60cc001b28 am: a0b41fca40 am: 793c3b14df am: cfa18212ff  -s ours am: 52a98daa1a am: 264f2b50b5 am: 353d59d997
am: 0731a26560

Change-Id: I7d2f66a795bc2129d103bc1988f4eb20617326f0

7 years agoMerge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1...
Jeff Sharkey [Fri, 2 Dec 2016 02:05:46 +0000 (02:05 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am: e49ba8b3d8
am: 0202b4601d

Change-Id: I8c74be211eb1b7497b630ef53c7812d9156f1863

7 years agoMerge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev
Jeff Sharkey [Fri, 2 Dec 2016 02:05:37 +0000 (02:05 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev
am: 73b49fc7e8

Change-Id: I65b86aaaec4033f19b3f3560d1c57bf32f1a4d5e

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing.
Jeff Sharkey [Fri, 2 Dec 2016 02:05:34 +0000 (02:05 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: 17010dc0d2

Change-Id: I7c6d507411864912937c9dbacc985cb834760cfe

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 6eee8e37fd
Jeff Sharkey [Fri, 2 Dec 2016 02:04:40 +0000 (02:04 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 6eee8e37fd
am: 6795459a80

Change-Id: I2ca4cd7315a5e22c0bc53519b3705248ebf924ed

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am...
Jeff Sharkey [Fri, 2 Dec 2016 02:03:27 +0000 (02:03 +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: Ic3d7068ba87f1859085e70b390a6497d52cc7e8e

7 years agoMerge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1...
Jeff Sharkey [Fri, 2 Dec 2016 02:02:08 +0000 (02:02 +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: I2f59d1f57871e797c6edb7510b27aba030e51692

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f084ccd48d -s...
Jeff Sharkey [Fri, 2 Dec 2016 02:00:51 +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: I96fcef9277b247c7543d461116aeaaa5ce402998

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am...
Jeff Sharkey [Fri, 2 Dec 2016 01:59:43 +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: I3a350e0b20187e66480bdb03344b46f3b42e3737

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s...
Jeff Sharkey [Fri, 2 Dec 2016 01:59:39 +0000 (01:59 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d  -s ours am: 704085119d am: 8bd3aa70ad  -s ours am: 60cc001b28 am: a0b41fca40 am: 793c3b14df am: cfa18212ff  -s ours am: 52a98daa1a am: 264f2b50b5
am: 353d59d997

Change-Id: Id5f9617fcc3f3a02fbb5fdd47b1fa9c605ec2a3b

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s...
Jeff Sharkey [Fri, 2 Dec 2016 01:53:55 +0000 (01:53 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d  -s ours am: 704085119d am: 8bd3aa70ad  -s ours am: 60cc001b28 am: a0b41fca40 am: 793c3b14df am: cfa18212ff  -s ours am: 52a98daa1a
am: 264f2b50b5

Change-Id: If9d02088e2853c8959e7beb54a30c92dc3dd61de

7 years agoMerge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev
Jeff Sharkey [Fri, 2 Dec 2016 01:52:15 +0000 (01:52 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev
am: e49ba8b3d8

Change-Id: I6e2a50c80c12c9cd88f36a019fa814713f724c82

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing.
Jeff Sharkey [Fri, 2 Dec 2016 01:52:12 +0000 (01:52 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: 6eee8e37fd

Change-Id: I431b334bbf3580f51fc8e31da28c9c9d6f5944ee

7 years agoMerge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev
TreeHugger Robot [Fri, 2 Dec 2016 01:51:44 +0000 (01:51 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am...
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

7 years agoMerge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f084ccd48d -s...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s...
Jeff Sharkey [Fri, 2 Dec 2016 01:47:50 +0000 (01:47 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d  -s ours am: 704085119d am: 8bd3aa70ad  -s ours am: 60cc001b28 am: a0b41fca40 am: 793c3b14df am: cfa18212ff  -s ours
am: 52a98daa1a

Change-Id: I26fab4fb01b88370f84c1767c79998ebc503d731

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am...
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

7 years agoMerge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev
TreeHugger Robot [Fri, 2 Dec 2016 01:41:45 +0000 (01:41 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am...
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

7 years agoMerge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f084ccd48d -s...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s...
Jeff Sharkey [Fri, 2 Dec 2016 01:36:30 +0000 (01:36 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d  -s ours am: 704085119d am: 8bd3aa70ad  -s ours am: 60cc001b28 am: a0b41fca40 am: 793c3b14df
am: cfa18212ff  -s ours

Change-Id: I9b99f86f7703a960154859f1824c21edae0515d4

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220 am...
Jeff Sharkey [Fri, 2 Dec 2016 01:36:29 +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: I441c9eeae0caee8423ec522d48cae44984a00c38

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am...
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

7 years agoMerge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f084ccd48d -s...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220 am...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s...
Jeff Sharkey [Fri, 2 Dec 2016 01:24:37 +0000 (01:24 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d  -s ours am: 704085119d am: 8bd3aa70ad  -s ours am: 60cc001b28 am: a0b41fca40
am: 793c3b14df

Change-Id: Ieb6c0ded58178120a8407efd023a190648db8c08

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220 am...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s...
Jeff Sharkey [Fri, 2 Dec 2016 01:18:27 +0000 (01:18 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d  -s ours am: 704085119d am: 8bd3aa70ad  -s ours am: 60cc001b28
am: a0b41fca40

Change-Id: I12241d8c7c843c63981dfda795f99c8d18634d74

7 years agoMerge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing.
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220 am...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s...
Jeff Sharkey [Fri, 2 Dec 2016 01:13:04 +0000 (01:13 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d  -s ours am: 704085119d am: 8bd3aa70ad  -s ours
am: 60cc001b28

Change-Id: Ic21f6cc9072ae65ba67f117a21c4703e8f8cf6ea

7 years agoMerge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220 am...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s...
Jeff Sharkey [Fri, 2 Dec 2016 01:01:52 +0000 (01:01 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d  -s ours am: 704085119d
am: 8bd3aa70ad  -s ours

Change-Id: I3ef5d68391566fc428906799a6ec6d166b9479a4

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am...
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s...
Jeff Sharkey [Fri, 2 Dec 2016 00:56:32 +0000 (00:56 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d  -s ours
am: 704085119d

Change-Id: Ic687581a9bf5f0906cdb7642e59b81d9b6175aca

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing.
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing.
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing.
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

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing.
Jeff Sharkey [Fri, 2 Dec 2016 00:50:27 +0000 (00:50 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: f279a5bc0d  -s ours

Change-Id: I7fde8a3cd529bc495aa7e886988d73e22815c0b4

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing.
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: 3217254230537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing.
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: 3217254230537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing.
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: 3217254230537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing.
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: 3217254230537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing.
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: 3217254230537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing.
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: 3217254230537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)

7 years agoDO NOT MERGE. Retain DownloadManager Uri grants when clearing.
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: 3217254230537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)

7 years agoMerge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into...
Julius D'souza [Thu, 1 Dec 2016 22:35:46 +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: I6e59afddfc4cb73a1cf913b6799a4c6545464c7b

7 years agoDO NOT MERGE: Sync with master: Add initial ambient light sensor rate
Julius D'souza [Thu, 1 Dec 2016 22:35:41 +0000 (22:35 +0000)]
DO NOT MERGE: Sync with master: Add initial ambient light sensor rate
am: 5c7ae14148

Change-Id: I998a032daf0eadf9be003969505958acc1965693

7 years agoMerge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into...
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

7 years agoMerge "Revert "Introduce a new user restriction for disallowing Bluetooth."" am:...
ltrochtova [Thu, 1 Dec 2016 21:57:04 +0000 (21:57 +0000)]
Merge "Revert "Introduce a new user restriction for disallowing Bluetooth."" am: 4eb075e89f  -s ours
am: 834725f579

Change-Id: Idda7a70676bb3d6ac028482064c22e61180768f6

7 years agoMerge "Add command line action sequencing." am: 880c9acf4a
Michael Rosenfeld [Thu, 1 Dec 2016 21:51:56 +0000 (21:51 +0000)]
Merge "Add command line action sequencing." am: 880c9acf4a
am: 3711f2f0c2

Change-Id: I8fae92c813fd7c2d3488b38217420affc5540c08

7 years agoMerge "Merge "AWARE: Abstract structure of match filters" am: f358a69cba am: 7f12aa54...
Android Build Merger (Role) [Thu, 1 Dec 2016 21:49:15 +0000 (21:49 +0000)]
Merge "Merge "AWARE: Abstract structure of match filters" am: f358a69cba am: 7f12aa5470" into nyc-mr1-dev-plus-aosp

7 years agoMerge "Revert "Introduce a new user restriction for disallowing Bluetooth.""
ltrochtova [Thu, 1 Dec 2016 21:48:07 +0000 (21:48 +0000)]
Merge "Revert "Introduce a new user restriction for disallowing Bluetooth.""
am: 4eb075e89f  -s ours

Change-Id: Ibcc0b6db64260f444c5884ce9df39395d59a6158

7 years agoMerge "AWARE: Abstract structure of match filters" am: f358a69cba
Etan Cohen [Thu, 1 Dec 2016 21:48:02 +0000 (21:48 +0000)]
Merge "AWARE: Abstract structure of match filters" am: f358a69cba
am: 7f12aa5470

Change-Id: I6d70ec6234752e2d84ad72dcbcbb15dfad6ad5d1

7 years agoMerge "Get the correct operator name" into nyc-mr1-dev-plus-aosp
Robert Greenwalt [Thu, 1 Dec 2016 21:46:47 +0000 (21:46 +0000)]
Merge "Get the correct operator name" into nyc-mr1-dev-plus-aosp

7 years agoMerge "Introduce a new user restriction for disallowing Bluetooth." am: 1e9a5eac92...
ltrochtova [Thu, 1 Dec 2016 21:43:41 +0000 (21:43 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth." am: 1e9a5eac92  -s ours
am: 0a21ba22e3

Change-Id: I6460fb58be9ecac4bbd4f13ad61537704bd4a150

7 years agoMerge "Add command line action sequencing."
Michael Rosenfeld [Thu, 1 Dec 2016 21:40:06 +0000 (21:40 +0000)]
Merge "Add command line action sequencing."
am: 880c9acf4a

Change-Id: I81b31d950e0dca525fbfe9aa38c9c113eea7cec8

7 years agoMerge "AWARE: Abstract structure of match filters"
Etan Cohen [Thu, 1 Dec 2016 21:35:05 +0000 (21:35 +0000)]
Merge "AWARE: Abstract structure of match filters"
am: f358a69cba

Change-Id: Ic7e87e47e9a9beebb11aa7465e4d2be9dd3e767a

7 years agoMerge "Introduce a new user restriction for disallowing Bluetooth."
ltrochtova [Thu, 1 Dec 2016 21:31:23 +0000 (21:31 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth."
am: 1e9a5eac92  -s ours

Change-Id: I35d19d46b8edbacb66613e11a398c742f9d37029

7 years agoMerge "Revert "Introduce a new user restriction for disallowing Bluetooth.""
ltrochtova [Thu, 1 Dec 2016 21:20:42 +0000 (21:20 +0000)]
Merge "Revert "Introduce a new user restriction for disallowing Bluetooth.""

7 years agoRevert "Introduce a new user restriction for disallowing Bluetooth."
ltrochtova [Thu, 1 Dec 2016 20:50:53 +0000 (20:50 +0000)]
Revert "Introduce a new user restriction for disallowing Bluetooth."

This reverts commit 69f9d321ac19e7137e07b411779339f9973eba1b.

Change-Id: I5859b262a741d1fe8e8b61e142eecf7d742d8d41

7 years agoGet the correct operator name
Zoran Jovanovic [Wed, 2 Nov 2016 08:56:38 +0000 (09:56 +0100)]
Get the correct operator name

If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Test: ServiceStateTrackerTest.java exteneded in partner cl
Depends-On: commit in frameworks/opt/telephony with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db

7 years agoMerge "Add command line action sequencing."
Treehugger Robot [Thu, 1 Dec 2016 17:23:37 +0000 (17:23 +0000)]
Merge "Add command line action sequencing."

7 years agoMerge "AWARE: Abstract structure of match filters"
Etan Cohen [Thu, 1 Dec 2016 15:42:34 +0000 (15:42 +0000)]
Merge "AWARE: Abstract structure of match filters"

7 years agoMerge "Introduce a new user restriction for disallowing Bluetooth."
ltrochtova [Thu, 1 Dec 2016 13:40:28 +0000 (13:40 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth."

7 years agoIntroduce a new user restriction for disallowing Bluetooth.
Lenka Trochtova [Thu, 24 Nov 2016 15:48:37 +0000 (16:48 +0100)]
Introduce a new user restriction for disallowing Bluetooth.

Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on
the  entire device - i.e. in all the users.

Test: cts-tradefed run cts -m  CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m  CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction

Bug: 32895300

Change-Id: Iae77647b1e48be6b8efbeccdff6a3d468a0e174d

7 years agoMerge "Add meteredOverride field to WifiConfiguration." am: f9479fe639
Stephen Chen [Thu, 1 Dec 2016 03:29:00 +0000 (03:29 +0000)]
Merge "Add meteredOverride field to WifiConfiguration." am: f9479fe639
am: dfd9942a31

Change-Id: Ia14b87efb46acf8ad8c4ad7921fdefdceb185f86

7 years agoMerge "Add meteredOverride field to WifiConfiguration."
Stephen Chen [Thu, 1 Dec 2016 03:23:32 +0000 (03:23 +0000)]
Merge "Add meteredOverride field to WifiConfiguration."
am: f9479fe639

Change-Id: I0d2540cf0a360f07c1dd103191fd348602099ff5

7 years agoMerge "Add meteredOverride field to WifiConfiguration."
Treehugger Robot [Thu, 1 Dec 2016 03:08:44 +0000 (03:08 +0000)]
Merge "Add meteredOverride field to WifiConfiguration."

7 years agoMerge "App_process: Merge app_process and app_process__asan" am: de32925ccd
Andreas Gampe [Thu, 1 Dec 2016 02:59:01 +0000 (02:59 +0000)]
Merge "App_process: Merge app_process and app_process__asan" am: de32925ccd
am: 0662cd5de8

Change-Id: I6df03a4573610d600a037b52635414bc600772e0

7 years agoMerge "Change exit animation to use normal z-order." into cw-f-dev
Michael Kwan [Thu, 1 Dec 2016 02:53:10 +0000 (02:53 +0000)]
Merge "Change exit animation to use normal z-order." into cw-f-dev
am: 6abcefd350

Change-Id: I451251a4e1d579dfc10ab3ddaf4bdd5ee02e2372

7 years agoChange exit animation to use normal z-order.
Michael Kwan [Thu, 1 Dec 2016 02:53:04 +0000 (02:53 +0000)]
Change exit animation to use normal z-order.
am: a562fe4a23

Change-Id: Ib0ed1f600bb55e792eb31f28f275cd3717a9c454

7 years agoMerge "App_process: Merge app_process and app_process__asan"
Andreas Gampe [Thu, 1 Dec 2016 02:48:18 +0000 (02:48 +0000)]
Merge "App_process: Merge app_process and app_process__asan"
am: de32925ccd

Change-Id: I86aaea459fdc1283a3b7e2f0b035ad26aef98920

7 years agoMerge "Change exit animation to use normal z-order." into cw-f-dev
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

7 years agoMerge "App_process: Merge app_process and app_process__asan"
Treehugger Robot [Thu, 1 Dec 2016 02:38:29 +0000 (02:38 +0000)]
Merge "App_process: Merge app_process and app_process__asan"

7 years agoMerge "Refactor NetworkScoreAppManager for testing." am: 3af97482f1
Amin Shaikh [Thu, 1 Dec 2016 02:21:03 +0000 (02:21 +0000)]
Merge "Refactor NetworkScoreAppManager for testing." am: 3af97482f1
am: a8fc97d2de

Change-Id: I34ed2f31eaa1336990c941ee63eea0c1ddbc305c

7 years agoMerge "Refactor NetworkScoreAppManager for testing."
Amin Shaikh [Thu, 1 Dec 2016 02:10:55 +0000 (02:10 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."
am: 3af97482f1

Change-Id: I99537b7841021704c162db6b8fe3d472ede1e991

7 years agoMerge "Refactor NetworkScoreAppManager for testing."
Treehugger Robot [Thu, 1 Dec 2016 01:59:13 +0000 (01:59 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."