Commit Graph

301953 Commits

Author SHA1 Message Date
Android Build Merger (Role)
589c9a3fca Merge "Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a" into nyc-mr1-dev-plus-aosp am: 8d8cfa2345" into nyc-mr2-dev-plus-aosp 2016-12-02 04:05:32 +00:00
Android Build Merger (Role)
da0b45e8e5 Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a am: e9e77f2603" into nyc-mr2-dev-plus-aosp 2016-12-02 04:05:16 +00:00
Christine Hallstrom
29059b46e6 Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a
am: e9e77f2603

Change-Id: I50aa8a739f8bf6e5697de8c6f45cfa1c9610f7ac
2016-12-02 04:04:23 +00:00
Christine Hallstrom
3e68c06ed3 Add ability to set supported audio routes on phone accounts and connection am: 4e22d6dc45 am: bad3a2ab2e
am: 22de17247b

Change-Id: Ib2eab7f6bc9105977b586366b5bd46097e1aca1c
2016-12-02 04:03:55 +00:00
Android Build Merger (Role)
7513beb97f Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a am: 0fbd9b7773" into nyc-mr2-dev-plus-aosp 2016-12-02 04:03:50 +00:00
Mark Salyzyn
dc13cff108 Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a" into nyc-mr1-dev-plus-aosp
am: 8d8cfa2345

Change-Id: Ibb88157c980597ec7a6fd1141736e0c67b068bd7
2016-12-02 04:03:00 +00:00
Mark Salyzyn
10585f5c86 Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a
am: 0fbd9b7773

Change-Id: If711f660c7c6b203a8a8e0b54073ded64d686c1e
2016-12-02 04:02:55 +00:00
Android Build Merger (Role)
afd2e89fc4 Merge "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 am: 325e93dfa3" into nyc-mr2-dev-plus-aosp 2016-12-02 04:02:32 +00:00
Android Build Merger (Role)
31a1a8e559 Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a am: 5599fb3795" into nyc-mr2-dev-plus-aosp 2016-12-02 04:02:06 +00:00
Christine Hallstrom
599697dcfd 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
am: 325e93dfa3

Change-Id: I4111cc7e11a410a3160f2cab5fe16cbd26a91db9
2016-12-02 04:01:11 +00:00
Christine Hallstrom
40b42d7925 Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a
am: 5599fb3795

Change-Id: I59ecf91d4178dc55b7cbab9ec3f93524f8bcfe62
2016-12-02 04:01:06 +00:00
Android Build Merger (Role)
c8cdab674d Merge "Merge "Get the correct operator name" am: 297e9f9a32 am: 2232ac8c59 am: 18a0e81a06" into nyc-mr2-dev-plus-aosp 2016-12-02 04:00:35 +00:00
Robert Greenwalt
2f31f105e6 Merge "Get the correct operator name" am: 297e9f9a32 am: 2232ac8c59
am: 18a0e81a06

Change-Id: I2eb4c69121e7635c885eca227b1eb3eea13fe13f
2016-12-02 03:59:24 +00:00
Android Build Merger (Role)
c027c8dba8 Merge "Add ability to set supported audio routes on phone accounts and connection am: 4e22d6dc45 am: 9161228e31" into nyc-mr2-dev-plus-aosp 2016-12-02 03:58:53 +00:00
Christine Hallstrom
22de17247b Add ability to set supported audio routes on phone accounts and connection am: 4e22d6dc45
am: bad3a2ab2e

Change-Id: Ib162b2de42b636081a07d91a61406858d40e56f3
2016-12-02 03:57:13 +00:00
Christine Hallstrom
a30ef94b07 Add ability to set supported audio routes on phone accounts and connection am: 4e22d6dc45
am: 9161228e31

Change-Id: If9eb6d0d8be1c1e7080726a7b431431d245387a6
2016-12-02 03:57:07 +00:00
Christine Hallstrom
e9e77f2603 Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev
am: fd1f724e7a

Change-Id: I40000727f29126b87625b1930b278e7c630a82a9
2016-12-02 03:57:06 +00:00
Android Build Merger (Role)
8d8cfa2345 Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a" into nyc-mr1-dev-plus-aosp 2016-12-02 03:52:19 +00:00
Android Build Merger (Role)
325e93dfa3 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 2016-12-02 03:51:41 +00:00
Mark Salyzyn
0fbd9b7773 Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450
am: de04a0480a

Change-Id: I21996e138bd6331b5a5aaa479e33f95f8ec53351
2016-12-02 03:51:36 +00:00
Christine Hallstrom
5599fb3795 Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev
am: fd1f724e7a

Change-Id: I57ef120cb7bb529f8c7ee0226563a1f8e3272d42
2016-12-02 03:50:39 +00:00
Robert Greenwalt
18a0e81a06 Merge "Get the correct operator name" am: 297e9f9a32
am: 2232ac8c59

Change-Id: I0291098331abacfd48a479d00ef61e52110037c2
2016-12-02 03:50:33 +00:00
Christine Hallstrom
9161228e31 Add ability to set supported audio routes on phone accounts and connection
am: 4e22d6dc45

Change-Id: I5144f403e9dcdc7934fa56e045e2f95703af7ad6
2016-12-02 03:45:29 +00:00
Christine Hallstrom
bad3a2ab2e Add ability to set supported audio routes on phone accounts and connection
am: 4e22d6dc45

Change-Id: I297896e35044be8affdd4102f223a9b32321a272
2016-12-02 03:45:16 +00:00
Mark Salyzyn
de04a0480a Merge "jni: EventLog replace open coding with android_log_event_list"
am: 1981812450

Change-Id: Ia6a4daf5b90ef20d227e06c9322a84ed7d3bb8aa
2016-12-02 03:44:33 +00:00
Robert Greenwalt
2232ac8c59 Merge "Get the correct operator name"
am: 297e9f9a32

Change-Id: Ic4c433e9b7e70427275fbbba785bb365e0ced8d5
2016-12-02 03:39:30 +00:00
Christine Hallstrom
fd1f724e7a Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev 2016-12-02 03:38:13 +00:00
Jeff Sharkey
5121d75ad0 Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am: 73b49fc7e8 am: 8c456f7f39 am: 5902fdad90 am: f906cf3102 am: 63036e2fec" into nyc-mr2-dev-plus-aosp
am: a546f6ff50  -s ours

Change-Id: I3f2c5d501c0a773f60a01aa5328b481eaeff0bdb
2016-12-02 03:00:16 +00:00
Jeff Sharkey
90d9fb44d7 Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am: 73b49fc7e8 am: 8c456f7f39 am: 5902fdad90 am: f906cf3102 am: 63036e2fec
am: 5b6fde8c0b  -s ours

Change-Id: Id82f8577d3ed25b1e0805082b843fcba71947388
2016-12-02 03:00:10 +00:00
Jeff Sharkey
661adb672b Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2 am: bc7aae3610 am: 0d774967ba am: 7b1ae648a4 am: b5ee31237f" into nyc-mr2-dev-plus-aosp
am: f5163cec88  -s ours

Change-Id: I5867c5e05d38f8af6f615ae613ddb1ef4ab0b939
2016-12-02 02:58:18 +00:00
Jeff Sharkey
b462665b56 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2 am: bc7aae3610 am: 0d774967ba am: 7b1ae648a4 am: b5ee31237f
am: 6dcaedf61e  -s ours

Change-Id: Iaf321140b1be4aac4a784d87845e1068c6b3b9db
2016-12-02 02:58:13 +00:00
Jeff Sharkey
560e7d8ea0 Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am: 73b49fc7e8 am: 8c456f7f39 am: 5902fdad90 am: f906cf3102 am: 0924331760
am: 73cca90f8d  -s ours

Change-Id: I8595d95b008a97bd7aad314bc81dff15a3a89a38
2016-12-02 02:56:59 +00:00
Jack He
1ac34e3657 Protect broadcast emitted by Bluetooth mapmce and pbap profile
Bug: 33281228
Test: mm -j 40
Change-Id: I273e9e3c02f431ba7006bcf5d230a6c30eb67843
2016-12-01 18:55:31 -08:00
Android Build Merger (Role)
a546f6ff50 Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am: 73b49fc7e8 am: 8c456f7f39 am: 5902fdad90 am: f906cf3102 am: 63036e2fec" into nyc-mr2-dev-plus-aosp 2016-12-02 02:52:57 +00:00
Jeff Sharkey
5b6fde8c0b Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am: 73b49fc7e8 am: 8c456f7f39 am: 5902fdad90 am: f906cf3102
am: 63036e2fec

Change-Id: Idd85e1ca306e5e875cc6aefb8b886d20390f7d1a
2016-12-02 02:52:09 +00:00
Jeff Sharkey
5474edabb5 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2 am: bc7aae3610 am: 0d774967ba am: 7b1ae648a4 am: ae231bc2ec
am: 2deb7ca80d  -s ours

Change-Id: I38f54e71148766b13f80f0a1b9d1713ccd396472
2016-12-02 02:52:05 +00:00
Android Build Merger (Role)
f5163cec88 Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2 am: bc7aae3610 am: 0d774967ba am: 7b1ae648a4 am: b5ee31237f" into nyc-mr2-dev-plus-aosp 2016-12-02 02:51:51 +00:00
Jeff Sharkey
73cca90f8d Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am: 73b49fc7e8 am: 8c456f7f39 am: 5902fdad90 am: f906cf3102
am: 0924331760

Change-Id: I211645ebafe7008db3a2b9b09a03a8430e0719e2
2016-12-02 02:50:59 +00:00
Jeff Sharkey
6dcaedf61e DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2 am: bc7aae3610 am: 0d774967ba am: 7b1ae648a4
am: b5ee31237f

Change-Id: I603087491b88dc3f84f8f79190e60b3884924cd8
2016-12-02 02:50:55 +00:00
Jeff Sharkey
c609eb74b3 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 am: 02d2c2025a
am: e49f632c85  -s ours

Change-Id: I0d92f5db0a52241c525dc8f87137e9b82470d983
2016-12-02 02:49:24 +00:00
Jeff Sharkey
273bc2e465 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 am: 72826577f5
am: d0c5aecfe5  -s ours

Change-Id: Ic74a94706add73fc0a3c941b2e65c3eee16a9cb8
2016-12-02 02:48:18 +00:00
Jeff Sharkey
be7cf4c4ec Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am: e49ba8b3d8 am: 0202b4601d am: 697a74cfc5" into nyc-mr2-dev-plus-aosp
am: 3f665d1778  -s ours

Change-Id: I7fcee70fda5479cebc76ea53e86701c8a57782c3
2016-12-02 02:46:44 +00:00
Jeff Sharkey
f6681eb5d9 Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am: e49ba8b3d8 am: 0202b4601d am: 697a74cfc5
am: c6f9dfe05d  -s ours

Change-Id: Ic5f47e574c482c1890ce508dfaf901f58c5dd994
2016-12-02 02:46:39 +00:00
Jeff Sharkey
2deb7ca80d DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2 am: bc7aae3610 am: 0d774967ba am: 7b1ae648a4
am: ae231bc2ec

Change-Id: I8ac097042f160862a541ba88bed14e38bff6b311
2016-12-02 02:45:11 +00:00
Jeff Sharkey
d57cc2de5d Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am: e49ba8b3d8 am: 0202b4601d am: 2e61d93a57" into nyc-mr2-dev-plus-aosp
am: 6684747f69  -s ours

Change-Id: Id36a2c5c0ccfe053c0a1e72172bb904cbca797dd
2016-12-02 02:45:10 +00:00
Jeff Sharkey
04a88e0f21 Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am: e49ba8b3d8 am: 0202b4601d am: 2e61d93a57
am: b36e99e3e8  -s ours

Change-Id: I3e4cf734181c73147133e68acf33f6b2b8367b0e
2016-12-02 02:45:05 +00:00
Jeff Sharkey
43f5b6d9ee Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 6eee8e37fd am: 6795459a80 am: ede3a78432" into nyc-mr2-dev-plus-aosp
am: 7b5acb8d51  -s ours

Change-Id: I125ecde2fcf6ccac1babcb159daf752ed2ed58bf
2016-12-02 02:43:25 +00:00
Jeff Sharkey
c2c0e1ac93 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 6eee8e37fd am: 6795459a80 am: ede3a78432
am: ea372362e6  -s ours

Change-Id: I7361f11917ede049f4bd95a43d269aa24e2e9c1a
2016-12-02 02:43:21 +00:00
Jeff Sharkey
0924331760 Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am: 73b49fc7e8 am: 8c456f7f39 am: 5902fdad90
am: f906cf3102

Change-Id: I1ee07eed9799b5f51af5788f0a983cc939a5fe90
2016-12-02 02:42:18 +00:00
Jeff Sharkey
af01ead2bc Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 6eee8e37fd am: 6795459a80 am: 6dbcefeea6" into nyc-mr2-dev-plus-aosp
am: 8f4427caa1  -s ours

Change-Id: I935716229f2b2e60df3dcdac5a27fd0400d9895c
2016-12-02 02:41:46 +00:00