David Christie
9c4d02fb3f
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 am: 8788a2413c am: c6ab92e93b am: 3970ee98f7 am: 735699f3ef am: 551e6c786f
...
am: 80b8f38224
2016-08-25 01:25:46 +00:00
David Christie
0ae74a8ccd
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 am: 0777ad8253 am: 187d841b75
...
am: 7f2aaf204d
2016-08-25 01:25:38 +00:00
David Christie
4f1d1fc92d
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70 am: a6de8f20c7
...
am: 00e1e39ae2
2016-08-25 01:25:30 +00:00
David Christie
e05354b13b
resolve merge conflicts of 8aaffd9 to nyc-dev
...
am: 36246a43e5
2016-08-25 01:25:29 +00:00
Dirk Dougherty
169f86ce7a
Remove obsolete collections and extras metadata files. Authors should use jd_extras_<lang> instead...
...
Change-Id: I1d41485aceef95e666223d63aea7e8eefb95c947
2016-08-24 18:00:56 -07:00
Daniel Yu
d64f8bfe1f
docs: Add docs on OnboardingFragment
...
Add a dev guide for OnboardingFragment, used to show
information to a first-time user in an Android TV app.
Bug: 26488857
Change-Id: I91305bf4013090e84c8771206f1144d210c038db
2016-08-24 16:45:36 -07:00
David Christie
36246a43e5
resolve merge conflicts of 8aaffd9 to nyc-dev
...
Change-Id: I4b1603b4cb1cdfc01f4842b2facf8c31a687bbe5
2016-08-24 16:45:01 -07:00
Narayan Kamath
472a7792f3
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0
...
am: dd496ec8b0
2016-08-24 22:43:15 +00:00
David Christie
80b8f38224
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 am: 8788a2413c am: c6ab92e93b am: 3970ee98f7 am: 735699f3ef
...
am: 551e6c786f
2016-08-24 22:43:12 +00:00
David Christie
7f2aaf204d
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 am: 0777ad8253
...
am: 187d841b75
2016-08-24 22:43:09 +00:00
David Christie
00e1e39ae2
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70
...
am: a6de8f20c7
2016-08-24 22:39:52 +00:00
Narayan Kamath
dd496ec8b0
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3
...
am: 8e168116d0
2016-08-24 22:33:43 +00:00
David Christie
551e6c786f
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 am: 8788a2413c am: c6ab92e93b am: 3970ee98f7
...
am: 735699f3ef
2016-08-24 22:33:41 +00:00
David Christie
187d841b75
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48
...
am: 0777ad8253
2016-08-24 22:33:39 +00:00
David Christie
a6de8f20c7
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619
...
am: 3aaac55e70
2016-08-24 22:33:37 +00:00
David Christie
8aaffd9ebf
resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5 am: e24eb2dbb5
...
am: 362668b6f7
2016-08-24 22:30:20 +00:00
Narayan Kamath
8e168116d0
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04
...
am: c01db7dca3
2016-08-24 22:23:54 +00:00
David Christie
735699f3ef
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 am: 8788a2413c am: c6ab92e93b
...
am: 3970ee98f7
2016-08-24 22:23:52 +00:00
David Christie
0777ad8253
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66
...
am: d610363a48
2016-08-24 22:23:49 +00:00
David Christie
3aaac55e70
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d
...
am: dd1016c619
2016-08-24 22:23:46 +00:00
David Christie
362668b6f7
resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5
...
am: e24eb2dbb5
2016-08-24 22:23:42 +00:00
David Christie
e24eb2dbb5
resolve merge conflicts of a2399b4 to mnc-dev
...
am: 6195acc2b5
2016-08-24 22:16:07 +00:00
Narayan Kamath
c01db7dca3
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f
...
am: c11e8fcc04
2016-08-24 22:14:36 +00:00
David Christie
3970ee98f7
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 am: 8788a2413c
...
am: c6ab92e93b
2016-08-24 22:14:32 +00:00
David Christie
d610363a48
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1
...
am: af369f6e66
2016-08-24 22:14:28 +00:00
David Christie
dd1016c619
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
...
am: 975879a18d
2016-08-24 22:14:24 +00:00
Felipe Leme
910e6efe84
DO NOT MERGE ANYWHERE - Clear preferences when package is removed.
...
(cherry pick of commits 2154caf2f80fa87df84813b8e344f85094a454fd and
da1fc0a9c23697cc255efdccc47862bd1277da3f).
Change-Id: I5a019d771da6ff52ea36ee683a44405f6ea24853
Fixes: 30900628
Fixes: 28722556
(cherry picked from commit 20488d97cd
2016-08-24 14:27:48 -07:00
David Christie
6195acc2b5
resolve merge conflicts of a2399b4 to mnc-dev
...
Change-Id: Ifc9e13cdb047ef70799ba8b1b9e91357ef5f2d2a
2016-08-24 13:47:57 -07:00
Sudheer Shanka
cdf70ba0a3
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944
...
am: a0994c6d58
2016-08-24 20:38:40 +00:00
Sudheer Shanka
dfc2d0a4bc
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06
...
am: f21534a288
2016-08-24 20:38:30 +00:00
Amith Yamasani
7b8140652b
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986
...
am: 03b0f5c3ec
2016-08-24 20:38:20 +00:00
Sudheer Shanka
26bb7bf86c
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7
...
am: c8aedeeaf6
2016-08-24 20:38:16 +00:00
Amith Yamasani
117a383099
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf
...
am: dd0be992c0
2016-08-24 20:38:12 +00:00
Narayan Kamath
5191225400
Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47 am: efab128e67 am: 86437ec433
...
am: 4d7740907e
2016-08-24 20:30:21 +00:00
Narayan Kamath
c11e8fcc04
Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 am: b56f4f53e1 -s ours am: 2984748753 am: b9fae65605
...
am: c6c7ca0cde
2016-08-24 20:30:13 +00:00
Narayan Kamath
c6ab92e93b
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f
...
am: 3c63bb367f
2016-08-24 20:30:09 +00:00
David Christie
af369f6e66
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
...
am: 8788a2413c
2016-08-24 20:30:06 +00:00
David Christie
975879a18d
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24
...
am: 41a0dd41f1
2016-08-24 20:30:01 +00:00
Bill Yi
b92c637fec
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: e71ecb2c4d
...
am: 1bf3b41c0c
2016-08-24 20:21:34 +00:00
Sergio Giro
abef050951
Merge "javax.crypto.spec: update PBEParameterSpec to Java 8" am: 5d4732555d
...
am: 3b7c46af6f
2016-08-24 20:21:30 +00:00
Sergio Giro
8d9a8759af
Merge "javax.crypto: update classes in javax.crypto (part 2)" am: c7f97dbd57
...
am: 1384be9641
2016-08-24 20:21:27 +00:00
Sergio Giro
77322b04e6
Merge "java.security.spec: add public field in MGF1ParameterSpec" am: 5b24bccbc8
...
am: 08b6a09f32
2016-08-24 20:21:24 +00:00
Jakub Pawlowski
9e948dc372
Merge "Add WorkSource to BLE scanning API" am: d0a0ae349c -s ours
...
am: 2fde849eaf
2016-08-24 20:15:35 +00:00
Bill Yi
1bf3b41c0c
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
am: e71ecb2c4d
2016-08-24 20:11:30 +00:00
Sergio Giro
3b7c46af6f
Merge "javax.crypto.spec: update PBEParameterSpec to Java 8"
...
am: 5d4732555d
2016-08-24 20:11:24 +00:00
Sergio Giro
1384be9641
Merge "javax.crypto: update classes in javax.crypto (part 2)"
...
am: c7f97dbd57
2016-08-24 20:11:15 +00:00
Sergio Giro
08b6a09f32
Merge "java.security.spec: add public field in MGF1ParameterSpec"
...
am: 5b24bccbc8
2016-08-24 20:11:04 +00:00
Jakub Pawlowski
2fde849eaf
Merge "Add WorkSource to BLE scanning API"
...
am: d0a0ae349c
2016-08-24 20:06:47 +00:00
Bill Yi
e71ecb2c4d
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
Change-Id: I1c7301e4e6d7e5fed1fd57d2fb9cb65baf819de0
2016-08-24 11:23:13 -07:00
Salvador Martinez
3253853473
Merge "Added error handling to settings suggestions list" into nyc-dev
...
am: ed004e2958
2016-08-24 18:22:11 +00:00
