OSDN Git Service
Jeff Sharkey [Fri, 2 Dec 2016 19:55:09 +0000 (19:55 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours am:
ce477912a2 am:
920b02a94f -s ours am:
aff9286bd6 am:
37ff2d56bf am:
56247334f8 am:
923aef8e02 -s ours
am:
f199d511c3
Change-Id: I990a5459cd64bbc0e2ede2d3b5899163d12818f4
Jeff Sharkey [Fri, 2 Dec 2016 19:54:12 +0000 (19:54 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325 am:
a51ebb828a am:
acfda3d71a -s ours
am:
0eaa192436
Change-Id: Ie0fe9fd6770c94d56b3af10902c44c52d9a2f2a3
Jeff Sharkey [Fri, 2 Dec 2016 19:53:09 +0000 (19:53 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e am:
948841362a am:
7e54dc58d4 -s ours
am:
3fa188bd8f
Change-Id: Ibae31cd6439c2fdfcc9d333ca23bd466a7730218
Jeff Sharkey [Fri, 2 Dec 2016 19:52:04 +0000 (19:52 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0 am:
d081cb0ab7 am:
cd35e746dc -s ours
am:
836b54e6bb
Change-Id: Ib546b18b5373aaf8e429a3e8668a23a9d3b5c411
Jeff Sharkey [Fri, 2 Dec 2016 19:46:36 +0000 (19:46 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours am:
ce477912a2 am:
920b02a94f -s ours am:
aff9286bd6 am:
37ff2d56bf am:
56247334f8
am:
923aef8e02 -s ours
Change-Id: Ia0d0ac5ed1f8a84bd9158530fde499f91ac7f411
Jeff Sharkey [Fri, 2 Dec 2016 19:45:33 +0000 (19:45 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325 am:
a51ebb828a
am:
acfda3d71a -s ours
Change-Id: I0857c3cdd2e471ad04dbafc22a7898168a615a24
Jeff Sharkey [Fri, 2 Dec 2016 19:44:38 +0000 (19:44 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e am:
948841362a
am:
7e54dc58d4 -s ours
Change-Id: I3dce2baad70e1d9d606c27534f4ff4e9435f2445
Jeff Sharkey [Fri, 2 Dec 2016 19:43:33 +0000 (19:43 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0 am:
d081cb0ab7
am:
cd35e746dc -s ours
Change-Id: I12608bbd9173dc053df967174bc59f9297a151c2
Jeff Sharkey [Fri, 2 Dec 2016 19:29:15 +0000 (19:29 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours am:
ce477912a2 am:
920b02a94f -s ours am:
aff9286bd6 am:
37ff2d56bf
am:
56247334f8
Change-Id: I8bf5769fbb68fb10a4acd2c557dc1c66a3c448df
Jeff Sharkey [Fri, 2 Dec 2016 19:28:18 +0000 (19:28 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325
am:
a51ebb828a
Change-Id: Ic67fac2e28ab776632a98e3556c46826d7335a91
Jeff Sharkey [Fri, 2 Dec 2016 19:27:23 +0000 (19:27 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e
am:
948841362a
Change-Id: I66fdc5fb2ca169453b6b2f5dc7d6c10360aea709
Jeff Sharkey [Fri, 2 Dec 2016 19:26:28 +0000 (19:26 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0
am:
d081cb0ab7
Change-Id: I3fc3458a9050e1ee9cb57b9348d67ccd3ce71037
Jeff Sharkey [Fri, 2 Dec 2016 19:13:31 +0000 (19:13 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours am:
ce477912a2 am:
920b02a94f -s ours am:
aff9286bd6
am:
37ff2d56bf
Change-Id: I0ff63a0da9300799a8df538fcefaf0d27ea2be00
Jeff Sharkey [Fri, 2 Dec 2016 19:12:33 +0000 (19:12 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e
am:
5267b63325
Change-Id: I3cab573840604be9c44e85998c4b1a579d07aee4
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
Jeff Sharkey [Fri, 2 Dec 2016 19:11:29 +0000 (19:11 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8
am:
c130d7fd5e
Change-Id: I15e9c5f864ec67c8bf5901fcc46abe0c7b362a6e
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
Jeff Sharkey [Fri, 2 Dec 2016 19:10:35 +0000 (19:10 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b
am:
8b5fa0c0c0
Change-Id: Ie5bb120bcd900c2032e47f0ae3e1c710c083ae2e
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
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
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
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
Jeff Sharkey [Fri, 2 Dec 2016 18:56:56 +0000 (18:56 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours am:
ce477912a2 am:
920b02a94f -s ours
am:
aff9286bd6
Change-Id: I4f117247986cfa72156d26af917ba1bae6e9fa9b
Jeff Sharkey [Fri, 2 Dec 2016 18:56:01 +0000 (18:56 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours
am:
928c09cd8e
Change-Id: Ic470197dcc815e7ecf6b47dfd74ff6f4f74f1804
Jeff Sharkey [Fri, 2 Dec 2016 18:55:07 +0000 (18:55 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours
am:
f1085f2dc8
Change-Id: I565994dc5bbfc11b3293cb77aabca77b908a9039
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
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
Jeff Sharkey [Fri, 2 Dec 2016 18:53:57 +0000 (18:53 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours
am:
32af84320b
Change-Id: I73fe93944c2c2aebca02ca85d441905c2075bc65
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
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
Jeff Sharkey [Fri, 2 Dec 2016 18:40:25 +0000 (18:40 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours am:
ce477912a2
am:
920b02a94f -s ours
Change-Id: I3c2b9ba49785b40df3960fac4ffb17204cab063a
Jeff Sharkey [Fri, 2 Dec 2016 18:39:20 +0000 (18:39 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa
am:
a1d1ecbe05 -s ours
Change-Id: I6d4f8a29537e19545bf94a886aecea8ba05a6de7
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
Jeff Sharkey [Fri, 2 Dec 2016 18:38:01 +0000 (18:38 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14
am:
a7efe16fe1 -s ours
Change-Id: I17b84f1e8d8432292568c0adb2b3d89563a72b50
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
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
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
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
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
Jeff Sharkey [Fri, 2 Dec 2016 18:36:33 +0000 (18:36 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7
am:
792d49dfb5 -s ours
Change-Id: I50ab47cb03b65cc8be78c9a139561e4befbb1a95
Jeff Sharkey [Fri, 2 Dec 2016 18:30:18 +0000 (18:30 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours
am:
ce477912a2
Change-Id: I1f05c5204e6ba49a95a8b21cb457b04fe6738cb0
Jeff Sharkey [Fri, 2 Dec 2016 18:29:19 +0000 (18:29 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours
am:
9277cce7fa
Change-Id: I5cdc35759ad40566c02db6ee725c199ae255b5b8
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
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
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
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
Jeff Sharkey [Fri, 2 Dec 2016 18:19:56 +0000 (18:19 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev
am:
6b89229d14
Change-Id: I8f09aaed1be7f86cfb0a2cbe91ae5b4fe881df07
Jeff Sharkey [Fri, 2 Dec 2016 18:19:53 +0000 (18:19 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev
am:
ae7d4b1339 -s ours
Change-Id: Idc5d7d7d695db9ac7e7007447c89ca0466ea158b
Jeff Sharkey [Fri, 2 Dec 2016 18:19:51 +0000 (18:19 +0000)]
DO NOT MERGE. Check provider access for content changes.
am:
91add43ae7
Change-Id: I158a5dab0643fb5d2c07393f0df030e93b3c006a
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
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
Jeff Sharkey [Fri, 2 Dec 2016 18:19:50 +0000 (18:19 +0000)]
DO NOT MERGE. Check provider access for content changes.
am:
9b85862620 -s ours
Change-Id: I2a67bbde8b3e131ba62cedd0b6629912e226ba90
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
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
Jeff Sharkey [Fri, 2 Dec 2016 18:10:04 +0000 (18:10 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev
Jeff Sharkey [Fri, 2 Dec 2016 18:10:04 +0000 (18:10 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-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
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
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
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
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
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
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
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
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
Jeff Sharkey [Fri, 2 Dec 2016 01:28:44 +0000 (01:28 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca am:
ee8e0e8ae3 am:
f70dd1fbc1 -s ours
am:
60f17b8505
Change-Id: I10b4a404deb98692a372df001b5af742f84f9d06
Jeff Sharkey [Fri, 2 Dec 2016 01:27:34 +0000 (01:27 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am:
32d2b4c7af -s ours
am:
18ade37c6b
Change-Id: I374cd53de7cc8e68b2605f2edc9cf595d1119c3e
Jeff Sharkey [Fri, 2 Dec 2016 01:26:32 +0000 (01:26 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours
am:
d9a7f11334
Change-Id: I8b47e258124e4be1b4067712a7cbabb9b7c82a8a
Jeff Sharkey [Fri, 2 Dec 2016 01:25:28 +0000 (01:25 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours
am:
e94d76436b
Change-Id: Ice97dfb650bafe8fff720db26fcdc6f1db60037e
Jeff Sharkey [Fri, 2 Dec 2016 01:24: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
Jeff Sharkey [Fri, 2 Dec 2016 01:18:49 +0000 (01:18 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca am:
ee8e0e8ae3
am:
f70dd1fbc1 -s ours
Change-Id: Ie3be31b7010a3fae500b547fde31056084b3e2b7
Jeff Sharkey [Fri, 2 Dec 2016 01:18: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
Jeff Sharkey [Fri, 2 Dec 2016 01:14:27 +0000 (01:14 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev
am:
32d2b4c7af -s ours
Change-Id: Id4cf3526f7892971e4f226e98036166cbe8d28ef
Jeff Sharkey [Fri, 2 Dec 2016 01:14:23 +0000 (01:14 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
f084ccd48d -s ours
Change-Id: I9b4630b18d52ad503b88380c1a853bf3c0b46a10
Jeff Sharkey [Fri, 2 Dec 2016 01:13:18 +0000 (01:13 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4
am:
50102e63da -s ours
Change-Id: I3a587cb124b30ef5062600e7ba870da58213a094
Jeff Sharkey [Fri, 2 Dec 2016 01:13:13 +0000 (01:13 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca
am:
ee8e0e8ae3
Change-Id: I24fd90b2e61aabe95ccc5891c02fbbe2c795ba18
Jeff Sharkey [Fri, 2 Dec 2016 01:13:09 +0000 (01:13 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be am:
b981c3be70 -s ours
am:
a24a33490a
Change-Id: I8564b110d58f63aeee8afeab87773e97b7301a60
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
TreeHugger Robot [Fri, 2 Dec 2016 01:10:32 +0000 (01:10 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev
Jeff Sharkey [Fri, 2 Dec 2016 01:07:07 +0000 (01:07 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be
am:
b981c3be70 -s ours
Change-Id: I22fe97ae93c6e665288d46c29429ca7690352fb3
Jeff Sharkey [Fri, 2 Dec 2016 01:06:56 +0000 (01:06 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723
am:
af5f47caca
Change-Id: Idc1de786eee9966a0d555affdb2ac41fa134eb55
Jeff Sharkey [Fri, 2 Dec 2016 01:06:56 +0000 (01:06 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b
am:
061e7313b4
Change-Id: If0723e8cb1484263a3b96b37d21132d2ebc9b1b5
Jeff Sharkey [Fri, 2 Dec 2016 01: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
Jeff Sharkey [Fri, 2 Dec 2016 01:01:51 +0000 (01:01 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours
am:
1da786d723
Change-Id: I09b766396a8334551917723a47d5bba2590cb2bd
Jeff Sharkey [Fri, 2 Dec 2016 01:01:49 +0000 (01:01 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220
am:
2d549764be
Change-Id: Iad255e684d36524388a659181da0535bd15e37dc
Jeff Sharkey [Fri, 2 Dec 2016 01:01:49 +0000 (01:01 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3
am:
3e0d93036b
Change-Id: Ice0b80b96cdd7ad1a7691919982d98266a37f8bf
Jeff Sharkey [Fri, 2 Dec 2016 00:56:36 +0000 (00:56 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2
am:
b9a0b79675 -s ours
Change-Id: I82040d83bc780656b5deaa4fbe664700567e2138
Jeff Sharkey [Fri, 2 Dec 2016 00:56:32 +0000 (00:56 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f279a5bc0d -s ours
am:
704085119d
Change-Id: Ic687581a9bf5f0906cdb7642e59b81d9b6175aca
Jeff Sharkey [Fri, 2 Dec 2016 00:56:31 +0000 (00:56 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
3b0aa060a3
Change-Id: I3ba9a8dedfda4d878b99cc7de8a41418d424495c
Jeff Sharkey [Fri, 2 Dec 2016 00:56:26 +0000 (00:56 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
fbf395c220
Change-Id: I453445723ea9f6124d876dc32c6defab42432351
Jeff Sharkey [Fri, 2 Dec 2016 00:50:29 +0000 (00:50 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
1de465bec2
Change-Id: I14f82fa9c555bea0e71553713436a6836a421691
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
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Jeff Sharkey [Fri, 18 Nov 2016 22:31:22 +0000 (15:31 -0700)]
DO NOT MERGE. Check provider access for content changes.
For an app to either send or receive content change notifications,
require that they have some level of access to the underlying
provider.
Without these checks, a malicious app could sniff sensitive user data
from the notifications of otherwise private providers.
Test: builds, boots, PoC app now fails
Bug:
32555637
Change-Id: If2dcd45cb0a9f1fb3b93e39fc7b8ae9c34c2fdef
Jeff Sharkey [Fri, 18 Nov 2016 21:23:23 +0000 (14:23 -0700)]
DO NOT MERGE. Check provider access for content changes.
For an app to either send or receive content change notifications,
require that they have some level of access to the underlying
provider.
Without these checks, a malicious app could sniff sensitive user data
from the notifications of otherwise private providers.
Test: builds, boots, PoC app now fails
Bug:
32555637
Change-Id: If2dcd45cb0a9f1fb3b93e39fc7b8ae9c34c2fdef
OSDN Git Service
