git.osdn.net Git - android-x86/frameworks-base.git/log

Jeff Sharkey [Fri, 2 Dec 2016 19:04:02 +0000 (19:04 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 am: 45b6a52225 am: 34b87d94e4
am: 30ef1ad5be

Change-Id: I18a8e1de1557e15c289974240419abc59147facd

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:02:34 +0000 (19:02 +0000)]

DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88
am: bf9a60106b

Change-Id: I8c9cb10bfc49c49fe51512dbc9242c94820d474e

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:55:14 +0000 (18:55 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800
am: ef5d241938

Change-Id: I87f7ada782341c052d923fcd0798f58adc1942e2

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:55:04 +0000 (18:55 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 am: 45b6a52225
am: 34b87d94e4

Change-Id: Ibe93903e3be3f8a6581fc0a3acdc6482542f3204

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:53:58 +0000 (18:53 +0000)]

DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f
am: b4638e2d88

Change-Id: Iefbb713e624ec639205d51f560045a0cb5cf3dbc

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:53:57 +0000 (18:53 +0000)]

DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d
am: 9e7bd59457

Change-Id: Ia76c61296501cede3473ac743583643135820ad4

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:46:35 +0000 (18:46 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e
am: 26e6918800

Change-Id: I8b1bf2889bface1c6d8aad7c92b55c301059d6f5

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:46:35 +0000 (18:46 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1
am: 45b6a52225

Change-Id: Ie06f966f3b526c56de139a81edc7d8ccd5be074c

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:45:38 +0000 (18:45 +0000)]

DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b
am: ad04786a3d

Change-Id: I7272c2bab70ff8b6efd44c35f0131e57f6603748

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:45:30 +0000 (18:45 +0000)]

DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb
am: b88d8dc58f

Change-Id: I9587d5abd8d0525e3b098a5f9662e5edbc1f9c12

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:38:22 +0000 (18:38 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours
am: b685f719f1

Change-Id: If5744f0e5554877450b5e75f304fe857366de72c

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:37:43 +0000 (18:37 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d
am: 414334595e

Change-Id: I8af2c8895deb6abc89c7394809b3e2f24c41fa65

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:37:40 +0000 (18:37 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce
am: 21d36dcc91

Change-Id: Ib2a788b0ebb819ca7b51a668ee9a746fd6c02767

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:36:43 +0000 (18:36 +0000)]

DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours
am: 3f0e7465cb

Change-Id: Iaa85b6d22c436ff2c46eafe500a74448403c5886

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:36:36 +0000 (18:36 +0000)]

DO NOT MERGE: Check provider access for content changes. am: c813f5dae2
am: 2b7584f5b1

Change-Id: I1a74f306a4d9858a4e9726cd53ab544d28542522

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:36:34 +0000 (18:36 +0000)]

DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9
am: bdfb26ac3b

Change-Id: I93ab9555383689078ae6c08534619e8f38a47aaf

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:20:10 +0000 (18:20 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev
am: 0be332852e -s ours

Change-Id: Ia1266b2276eb2219fbd19aff20985d278bd58fac

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:20:06 +0000 (18:20 +0000)]

DO NOT MERGE: Check provider access for content changes.
am: 956bc433dc -s ours

Change-Id: I36a6cf33803635becf8ff794bb8f4e02ba5cd1d4

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:20:02 +0000 (18:20 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev
am: fdef2cd87d

Change-Id: Ie6f22b55f9bb934f93d7821e362163bbdbc71753

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:19:51 +0000 (18:19 +0000)]

DO NOT MERGE: Check provider access for content changes.
am: 11e3e52bd9

Change-Id: Ice374d398888e2898f571cee7df73f5e47921655

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:19:49 +0000 (18:19 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev
am: 5ec25934ce

Change-Id: I9608c14a117ab76bd08fa0a9b4d59b62ae1a28f5

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:19:46 +0000 (18:19 +0000)]

DO NOT MERGE: Check provider access for content changes.
am: c813f5dae2

Change-Id: I939bca8887198e2578916356d49b0f2f0a2bf3d2

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:10:02 +0000 (18:10 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:10:00 +0000 (18:10 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:09:59 +0000 (18:09 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev

commit | commitdiff | tree

Robert Sesek [Fri, 2 Dec 2016 17:21:27 +0000 (17:21 +0000)]

Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." am: eda1af611f
am: bbcd9d26b1

Change-Id: I7b7fbf2cc65712bd748a577c2eee1c0a1e35efee

commit | commitdiff | tree

Robert Sesek [Fri, 2 Dec 2016 17:15:23 +0000 (17:15 +0000)]

Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote."
am: eda1af611f

Change-Id: I539fb728175c109a93cbff7d8929b584e88bb70c

commit | commitdiff | tree

Treehugger Robot [Fri, 2 Dec 2016 17:02:31 +0000 (17:02 +0000)]

Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote."

Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" am: 7dd909684f
am: 33f0cf1267

Change-Id: I1cb33a340524aeb579330bd49affd02670e89c5a

Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile"
am: 7dd909684f

Change-Id: Ib90b23ef7b4271e2adc8a3c66963aaeb5c70a66f

commit | commitdiff | tree

Treehugger Robot [Fri, 2 Dec 2016 04:37:47 +0000 (04:37 +0000)]

Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile"

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 03:52:16 +0000 (03:52 +0000)]

Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 03:51:38 +0000 (03:51 +0000)]

Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Mark Salyzyn [Fri, 2 Dec 2016 03:51:36 +0000 (03:51 +0000)]

Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450
am: de04a0480a

Change-Id: I21996e138bd6331b5a5aaa479e33f95f8ec53351

commit | commitdiff | tree

Christine Hallstrom [Fri, 2 Dec 2016 03:50:39 +0000 (03:50 +0000)]

Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev
am: fd1f724e7a

Change-Id: I57ef120cb7bb529f8c7ee0226563a1f8e3272d42

commit | commitdiff | tree

Robert Greenwalt [Fri, 2 Dec 2016 03:50:33 +0000 (03:50 +0000)]

Merge "Get the correct operator name" am: 297e9f9a32
am: 2232ac8c59

Change-Id: I0291098331abacfd48a479d00ef61e52110037c2

commit | commitdiff | tree

Christine Hallstrom [Fri, 2 Dec 2016 03:45:29 +0000 (03:45 +0000)]

Add ability to set supported audio routes on phone accounts and connection
am: 4e22d6dc45

Change-Id: I5144f403e9dcdc7934fa56e045e2f95703af7ad6

commit | commitdiff | tree

Mark Salyzyn [Fri, 2 Dec 2016 03:44:33 +0000 (03:44 +0000)]

Merge "jni: EventLog replace open coding with android_log_event_list"
am: 1981812450

Change-Id: Ia6a4daf5b90ef20d227e06c9322a84ed7d3bb8aa

commit | commitdiff | tree

Robert Greenwalt [Fri, 2 Dec 2016 03:39:30 +0000 (03:39 +0000)]

Merge "Get the correct operator name"
am: 297e9f9a32

Change-Id: Ic4c433e9b7e70427275fbbba785bb365e0ced8d5

commit | commitdiff | tree

Christine Hallstrom [Fri, 2 Dec 2016 03:38:09 +0000 (03:38 +0000)]

Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev

Protect broadcast emitted by Bluetooth mapmce and pbap profile

Bug: 33281228
Test: mm -j 40
Change-Id: I273e9e3c02f431ba7006bcf5d230a6c30eb67843

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Christine Hallstrom [Thu, 1 Dec 2016 00:06:42 +0000 (16:06 -0800)]

Add ability to set supported audio routes on phone accounts and connection

The set audio routes are used by Telecom to restrict where the audio may
be routed to. For example, an account can specify that calls may not be
routed over bluetooth headsets, which will prevent a new call from being
routed to this source.

This is a cherry-pick of abandoned ag/1521009.

Bug: 32958838
Change-Id: Idd5e4d38b157f11454f3d991385644f2f384596e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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