OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am...
Jeff Sharkey [Fri, 2 Dec 2016 19:32:36 +0000 (19:32 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836  -s ours am: 99b97e5ed1 am: 398cdb6929
am: f00515f4d9

Change-Id: I667f20343f23366c2530a5ea658a5414c45f2799

7 years agoDO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b...
Jeff Sharkey [Fri, 2 Dec 2016 19:28:14 +0000 (19:28 +0000)]
DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a  -s ours am: c067e76bba am: 0891ca2fad
am: 12b2f8a275

Change-Id: I5d2e9c9faa81ddc2c1f29d10aaa8ef7567209969

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev...
Jeff Sharkey [Fri, 2 Dec 2016 19:27:26 +0000 (19:27 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746  -s ours am: aeeb9c8470 am: 8c74832d5e
am: 07ad2a9063

Change-Id: Ia05929a5edcc75490d8388008380d5db8f7edc85

7 years agoDO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2...
Jeff Sharkey [Fri, 2 Dec 2016 19:26:31 +0000 (19:26 +0000)]
DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27  -s ours am: e0fe3201cb am: 8165a22f53
am: 270d1c27ac

Change-Id: I426e531fd2fda1e09276dcfdc774fb548eedbefd

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am...
Jeff Sharkey [Fri, 2 Dec 2016 19:21:21 +0000 (19:21 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836  -s ours am: 99b97e5ed1
am: 398cdb6929

Change-Id: I40a0cb7f416d843b12893656d16dfed97d0df058

7 years agoDO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b...
Jeff Sharkey [Fri, 2 Dec 2016 19:20:23 +0000 (19:20 +0000)]
DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a  -s ours am: c067e76bba
am: 0891ca2fad

Change-Id: I2e9897c052ee296d68beb50b6ac927e5a0d92daa

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev...
Jeff Sharkey [Fri, 2 Dec 2016 19:19:29 +0000 (19:19 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746  -s ours am: aeeb9c8470
am: 8c74832d5e

Change-Id: I35d8c2faba5a6f359bbe51b56052bafe90a6cac1

7 years agoDO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2...
Jeff Sharkey [Fri, 2 Dec 2016 19:18:31 +0000 (19:18 +0000)]
DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27  -s ours am: e0fe3201cb
am: 8165a22f53

Change-Id: Iee87f3c3d384bf785b3c6c877a817c35bbdb478b

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am...
Jeff Sharkey [Fri, 2 Dec 2016 19:12:00 +0000 (19:12 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836  -s ours
am: 99b97e5ed1

Change-Id: I1812de0dd036142fae97145361fdf5da50e61536

7 years agoDO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b...
Jeff Sharkey [Fri, 2 Dec 2016 19:10:36 +0000 (19:10 +0000)]
DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a  -s ours
am: c067e76bba

Change-Id: I36e17906c43408126d1acabde89bf7ec04e16aab

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am...
Jeff Sharkey [Fri, 2 Dec 2016 19:03:40 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b
am: 26f78f5836  -s ours

Change-Id: I6521af4ca816ed3b03e6954159276971a55d349c

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev...
Jeff Sharkey [Fri, 2 Dec 2016 19:03:36 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746  -s ours
am: aeeb9c8470

Change-Id: I886018e68c75bb833d0a18c76f6db557b1b9c9e8

7 years agoDO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b...
Jeff Sharkey [Fri, 2 Dec 2016 19:02:42 +0000 (19:02 +0000)]
DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0
am: 4ad177829a  -s ours

Change-Id: I946f7bab2f86d26c23460cc5664d901f4f8fff06

7 years agoDO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2...
Jeff Sharkey [Fri, 2 Dec 2016 19:02:36 +0000 (19:02 +0000)]
DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27  -s ours
am: e0fe3201cb

Change-Id: Ifbfd912aac170923e5aea43e3b5ba9cfe135cea5

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev...
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

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am...
Jeff Sharkey [Fri, 2 Dec 2016 18:54:57 +0000 (18:54 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2
am: 44e8914f8b

Change-Id: I81d83d40d322bd6cfa2a6b74286cdfa425a2f951

7 years agoDO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5
Jeff Sharkey [Fri, 2 Dec 2016 18:53:58 +0000 (18:53 +0000)]
DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5
am: 74b36307a0

Change-Id: I6e5a7fbc4dfe0f207f6787ef5fbba93b0296e1b1

7 years agoDO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours...
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

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev...
Jeff Sharkey [Fri, 2 Dec 2016 18:47:08 +0000 (18:47 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04
am: 4610805746  -s ours

Change-Id: If9504039b5ec449edb2fb1e9f429a3d568a2aabf

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev...
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

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am...
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

7 years agoDO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a
Jeff Sharkey [Fri, 2 Dec 2016 18:45:38 +0000 (18:45 +0000)]
DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a
am: a07bcbcc27  -s ours

Change-Id: I9d320f3e2c77712757c17f1609c62c325cca9082

7 years agoDO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b
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

7 years agoDO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours...
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

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev...
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

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev...
Jeff Sharkey [Fri, 2 Dec 2016 18:37:58 +0000 (18:37 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4
am: 471812ad04

Change-Id: Ida67c1a00ac95109c647eb182af7628544bbb739

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am...
Jeff Sharkey [Fri, 2 Dec 2016 18:37:57 +0000 (18:37 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209
am: a80cbeeee2

Change-Id: I6b67d2f65208559d9cb5cd79bfec5fbc506abcad

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am...
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

7 years agoDO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours
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

7 years agoDO NOT MERGE: Check provider access for content changes. am: ff2fede0dd
Jeff Sharkey [Fri, 2 Dec 2016 18:36:40 +0000 (18:36 +0000)]
DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd
am: 7340749c2a

Change-Id: Iabb21a28a245d36f2247eaace573bdfd134f382d

7 years agoDO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0
Jeff Sharkey [Fri, 2 Dec 2016 18:36:38 +0000 (18:36 +0000)]
DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0
am: 190e20c2b5

Change-Id: Ib8d8b2b97b03acdd56e2cbdada404fb25535d234

7 years agoDO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9
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

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev
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

7 years agoDO NOT MERGE: Check provider access for content changes.
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

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dev
Jeff Sharkey [Fri, 2 Dec 2016 18:20:02 +0000 (18:20 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev
am: 8e14278209

Change-Id: I31e403ccc5207073d327a144f9b82fb93e01b865

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into nyc-dev
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

7 years agoDO NOT MERGE: Check provider access for content changes.
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

7 years agoDO NOT MERGE: Check provider access for content changes.
Jeff Sharkey [Fri, 2 Dec 2016 18:19:50 +0000 (18:19 +0000)]
DO NOT MERGE: Check provider access for content changes.
am: 4ddbf942a0

Change-Id: I9895591df11a2416cd3191ac9c790ecac167ece5

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev
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

7 years agoDO NOT MERGE: Check provider access for content changes.
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

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev
Jeff Sharkey [Fri, 2 Dec 2016 18:19:45 +0000 (18:19 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev
am: 48f6bdfce4

Change-Id: I70a8437a6d5c4b3ed69833a635aa8501ca26a41e

7 years agoDO NOT MERGE: Check provider access for content changes.
Jeff Sharkey [Fri, 2 Dec 2016 18:19:42 +0000 (18:19 +0000)]
DO NOT MERGE: Check provider access for content changes.
am: ff2fede0dd

Change-Id: I7de766d1acc1f20e83f07953dedfe3810f906db8

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev
Jeff Sharkey [Fri, 2 Dec 2016 18:10:03 +0000 (18:10 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev
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

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into mnc-dev
Jeff Sharkey [Fri, 2 Dec 2016 18:10:01 +0000 (18:10 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into nyc-dev
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

7 years agoMerge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev
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

7 years agoMerge "Add ability to set supported audio routes on phone accounts and connection...
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

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 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: 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: 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 agoAdd ability to set supported audio routes on phone accounts and connection
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

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