David Christie
|
975879a18d
|
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24
am: 41a0dd41f1
Change-Id: Ib74b0efa9b9345257d2b3ba59911baa324ec5801
|
2016-08-24 20:30:01 +00:00 |
|
David Christie
|
a2399b45e2
|
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
Change-Id: Ic44c577ef364bf81dd1e30b50c71718d4910eb10
|
2016-08-23 16:19:51 -07:00 |
|
David Christie
|
41a0dd41f1
|
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1
am: 62783bde30
Change-Id: I466311d2aa3983e690778fb1084f93eab7e8ae7d
|
2016-08-12 20:17:03 +00:00 |
|
David Christie
|
1081a15fd4
|
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2
am: b7f8b59e24
Change-Id: I26eda3647447490d58777d9fd8b2055ab8574e5e
|
2016-08-12 20:17:00 +00:00 |
|
David Christie
|
62783bde30
|
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a
am: 655361b2b1
Change-Id: I39e11f906f059cf8bb1ea861490a0e9051d11bed
|
2016-08-12 20:09:56 +00:00 |
|
David Christie
|
b7f8b59e24
|
resolve merge conflicts of b4a5615 to lmp-dev
am: 288166cbb2
Change-Id: Ie8927cbe2b224241f8d896487ff17117c15c0255
|
2016-08-12 20:09:54 +00:00 |
|
David Christie
|
655361b2b1
|
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676
am: 5a6b11114a
Change-Id: Ie2c2290014481772cf10c5f9e4fc565bf06e74a3
|
2016-08-12 19:56:57 +00:00 |
|
David Christie
|
288166cbb2
|
resolve merge conflicts of b4a5615 to lmp-dev
Change-Id: I1b9ebc398226ead9d7f494c4ac56a7b1d9d6586f
|
2016-08-11 13:06:08 -07:00 |
|
David Christie
|
5a6b11114a
|
Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev am: df7bd91dfa
am: b9fe170c6a
Change-Id: I3e320844622617d9ae63fea4cc3a34f9f0e1e93a
|
2016-08-11 18:33:18 +00:00 |
|
David Christie
|
b4a5615416
|
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923
am: 3462e52676
Change-Id: I45779f683b417fe2d3cd4f7702d07a9cd13bd6f0
|
2016-08-11 18:33:15 +00:00 |
|
David Christie
|
b9fe170c6a
|
Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev
am: df7bd91dfa
Change-Id: Idec27e5beca07ace75b08de5ce0b6ee8bf1ab7f7
|
2016-08-11 18:27:26 +00:00 |
|
David Christie
|
3462e52676
|
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864
am: dde12c6923
Change-Id: I772d5b997df579d3611eafc7542aeee2d690f946
|
2016-08-11 18:27:22 +00:00 |
|
David Christie
|
df7bd91dfa
|
Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev
|
2016-08-11 18:15:30 +00:00 |
|
Sungsoo Lim
|
ec986ac944
|
Merge \\\"DO NOT MERGE: Fix CTS regression\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9
am: 8ef8e2b648
Change-Id: I245e257deb8febb49f2abd7322eb3a24db564b31
|
2016-07-30 05:57:16 +00:00 |
|
Sungsoo Lim
|
1fcc472b3e
|
DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95
am: f928b8062c
Change-Id: I92c4e992dc23f43851a9fab8479db408a89f5e89
|
2016-07-30 05:57:09 +00:00 |
|
Sungsoo Lim
|
8ef8e2b648
|
Merge \\"DO NOT MERGE: Fix CTS regression\\" into lmp-dev am: 124cc534f8 -s ours
am: 3d58e326d9
Change-Id: Ic642286098aeeafe379c7f71b6a98da61fb31a21
|
2016-07-30 05:40:55 +00:00 |
|
Sungsoo Lim
|
f928b8062c
|
DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours
am: 0fb1075d95
Change-Id: I1a019156b580ec594afbb866bb7aec342de8e636
|
2016-07-30 05:40:52 +00:00 |
|
Sudheer Shanka
|
28acd0fae9
|
Merge \\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\" into lmp-mr1-dev am: dbbdb6d089
am: 9ed6bd83ff
Change-Id: I4f3bac4ecfc819dcca55a5bc725060b63c1b80ea
|
2016-07-30 05:08:39 +00:00 |
|
Sudheer Shanka
|
f01ee1c291
|
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e
am: 9f6bd40108
Change-Id: Id8afe281abcf8e9b07d7a92daacf922952273573
|
2016-07-30 05:08:35 +00:00 |
|
Sudheer Shanka
|
9ed6bd83ff
|
Merge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into lmp-mr1-dev
am: dbbdb6d089
Change-Id: I53e854c96f9bf68855ea949a640c4701e0b2ba5e
|
2016-07-30 04:54:27 +00:00 |
|
Sudheer Shanka
|
9f6bd40108
|
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
am: 7ef684713e
Change-Id: I0a9fa6126709e9cf3d3be7653f48503613d10f27
|
2016-07-30 04:54:25 +00:00 |
|
Sungsoo Lim
|
3d58e326d9
|
Merge \"DO NOT MERGE: Fix CTS regression\" into lmp-dev
am: 124cc534f8 -s ours
Change-Id: I960e31d55b6c47df345457afbd505c50afeebcfa
|
2016-07-30 04:44:18 +00:00 |
|
Sungsoo Lim
|
0fb1075d95
|
DO NOT MERGE: Fix CTS regression
am: edc9238514 -s ours
Change-Id: If11ad6b402e48aebcce8afc6d5f6093bde539a6e
|
2016-07-30 04:44:16 +00:00 |
|
Sungsoo Lim
|
124cc534f8
|
Merge "DO NOT MERGE: Fix CTS regression" into lmp-dev
|
2016-07-29 23:18:52 +00:00 |
|
Sudheer Shanka
|
dbbdb6d089
|
Merge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles." into lmp-mr1-dev
|
2016-07-29 21:50:33 +00:00 |
|
Sungsoo Lim
|
b8d3dd2472
|
DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a
am: b6a3e8ce8e
Change-Id: I51997dc68fc55e523050b4e642cdc4a22cd60f09
|
2016-07-29 19:14:02 +00:00 |
|
Sungsoo Lim
|
b6a3e8ce8e
|
DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours
am: 2dbb64594a
Change-Id: I04df61df1a926dbfe42d22127bdd4baabe7235d4
|
2016-07-29 19:03:14 +00:00 |
|
Sungsoo Lim
|
2dbb64594a
|
DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours
am: 6489d870d7 -s ours
Change-Id: I2631c56fbb3d7130b5389ed232c1a2fe0859b053
|
2016-07-29 18:56:07 +00:00 |
|
Sungsoo Lim
|
2df9864b54
|
DO NOT MERGE: Fix CTS regression am: 7a92dc9d99
am: 14abf736c8
Change-Id: I2a35f4853aa450ccc68862c166b6139ce67a1aad
|
2016-07-29 18:50:25 +00:00 |
|
Sungsoo Lim
|
6489d870d7
|
DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171
am: f645010092 -s ours
Change-Id: Iad2f1d1a445e4891892f03294fed028b71f94368
|
2016-07-29 18:45:45 +00:00 |
|
Sungsoo Lim
|
14abf736c8
|
DO NOT MERGE: Fix CTS regression
am: 7a92dc9d99
Change-Id: I13605f366810c158d380b11a814da8eac3e4e213
|
2016-07-29 18:38:07 +00:00 |
|
Sungsoo Lim
|
f645010092
|
DO NOT MERGE: Fix CTS regression am: df17644db7
am: 057b548171
Change-Id: I0ac1fec4b64a09dc8ee12986d8d91b39e511d989
|
2016-07-29 18:38:06 +00:00 |
|
Sungsoo Lim
|
057b548171
|
DO NOT MERGE: Fix CTS regression
am: df17644db7
Change-Id: Id9bed3c68661176a72bcb606e0fc0a026173ac22
|
2016-07-29 18:31:07 +00:00 |
|
Sudheer Shanka
|
7ef684713e
|
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
Bug: 29189712
Bug: 30317026
Bug: 30235113
Change-Id: Icced9805a56675e86f894c458c4a5a0048fd54c0
|
2016-07-29 10:51:02 -07:00 |
|
Sungsoo Lim
|
7a92dc9d99
|
DO NOT MERGE: Fix CTS regression
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
|
2016-07-29 01:01:49 +00:00 |
|
Sungsoo Lim
|
edc9238514
|
DO NOT MERGE: Fix CTS regression
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
|
2016-07-29 01:00:22 +00:00 |
|
Sungsoo Lim
|
df17644db7
|
DO NOT MERGE: Fix CTS regression
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
|
2016-07-29 00:56:16 +00:00 |
|
David Christie
|
dde12c6923
|
Fix vulnerability where large GPS XTRA data can be injected.
-Can potentially crash system with OOM.
Bug: 29555864
Change-Id: I7157f48dddf148a9bcab029cf12e26a58d8054f4
|
2016-07-25 17:13:23 -07:00 |
|
Paul Stewart
|
0f9a968c0e
|
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b
am: bb7439d8a1
Change-Id: I0aa11cbba826189e7e5e4e9196654c4f43157de0
|
2016-07-20 00:54:33 +00:00 |
|
Paul Stewart
|
6245774994
|
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d
am: 5d60d2f772
Change-Id: I1a0651d22571a4dec3b4b6ca97f6b62b930f1cc7
|
2016-07-20 00:54:27 +00:00 |
|
Paul Stewart
|
701a6c1ed6
|
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4
am: e41e0064ee
Change-Id: I9582c9327b859c981cb75d6aad52bb5dd1fafe20
|
2016-07-20 00:54:20 +00:00 |
|
Paul Stewart
|
bb7439d8a1
|
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26
am: c92e93c47b
Change-Id: I50ca54dc65b61cb2dbb550eb964bd50938595168
|
2016-07-20 00:45:09 +00:00 |
|
Paul Stewart
|
5d60d2f772
|
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b
am: 700c72d01d
Change-Id: I6fc08163a75790e15d05ab952ad4e706a1391916
|
2016-07-20 00:45:07 +00:00 |
|
Paul Stewart
|
e41e0064ee
|
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103
am: e2a03026c4
Change-Id: Iba16c43199d5ab238ce129d37519f9c5a7ba2005
|
2016-07-20 00:45:04 +00:00 |
|
Paul Stewart
|
c92e93c47b
|
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891
am: 2e85e2ef26
Change-Id: If8a2f4e1fcbb4adf6e2ddef438781fb83de04cc3
|
2016-07-20 00:37:53 +00:00 |
|
Paul Stewart
|
700c72d01d
|
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4
am: bf4f010a5b
Change-Id: I7e57c484be20197748c40c80acd987802b43a734
|
2016-07-20 00:37:50 +00:00 |
|
Paul Stewart
|
e2a03026c4
|
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9
am: 141477b103
Change-Id: Ie4c9d06d225a2b99ebb4411e4282ea792c67d26b
|
2016-07-20 00:37:44 +00:00 |
|
Paul Stewart
|
2e85e2ef26
|
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28
am: 58555ee891
Change-Id: I1032efe65d45995a79572f669cddc5a4cf6131d9
|
2016-07-20 00:31:29 +00:00 |
|
Paul Stewart
|
bf4f010a5b
|
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf
am: 3fbe9280a4
Change-Id: Ib3bea7489d319bb94a41f3c8cb0d8ec7e40b14b7
|
2016-07-20 00:31:22 +00:00 |
|
Paul Stewart
|
141477b103
|
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6
am: df93deccf9
Change-Id: Iaeae846189a8f5fa38c5da988eec7879300f8ab5
|
2016-07-20 00:31:15 +00:00 |
|