Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
frameworks
/
base
/
de40f9d677db995064e7d964550be62db4df65c0
« Previous
c2b9d55
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev
by Dirk Dougherty
· 8 years ago
0737c2b
DO NOT MERGE Stop work challenge freeform bypass
by Robin Lee
· 8 years ago
314d995
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev
by Mark Lu
· 8 years ago
3c638c1
Merge "docs: fix link in Loader reference page" into nyc-dev
by Mark Lu
· 8 years ago
fea9feb
Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd" into nyc-dev
by Android Build Merger (Role)
· 8 years ago
cca29c72
Merge "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 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours" into nyc-dev
by Android Build Merger (Role)
· 8 years ago
5f5403de
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours" into nyc-dev
by Android Build Merger (Role)
· 8 years ago
555fbf3
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b -s ours" into nyc-dev
by Android Build Merger (Role)
· 8 years ago
4ee46e5
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180 -s ours" into nyc-dev
by Android Build Merger (Role)
· 8 years ago
8d660ee
Merge "docs: Fix typo" into nyc-dev
by Mark Goldstein
· 8 years ago
d575658
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25
by Sudheer Shanka
· 8 years ago
02ba5ef
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 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39
by Sudheer Shanka
· 8 years ago
4a3caef
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca
by Amith Yamasani
· 8 years ago
6a9490f
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa
by Sudheer Shanka
· 8 years ago
b6cc1ac
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38
by Amith Yamasani
· 8 years ago
7a46fac
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3
by Sudheer Shanka
· 8 years ago
71933ab
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 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab
by Sudheer Shanka
· 8 years ago
7586e03
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41
by Amith Yamasani
· 8 years ago
bc5775c
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e
by Sudheer Shanka
· 8 years ago
a106b52
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a
by Amith Yamasani
· 8 years ago
1238ffc
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76
by Narayan Kamath
· 8 years ago
203d1be
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c
by Sudheer Shanka
· 8 years ago
c35a9fe
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 am: dfc2d0a4bc -s ours am: 603a69ffb4
by Sudheer Shanka
· 8 years ago
f636175
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e
by Amith Yamasani
· 8 years ago
2f66437
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb
by Sudheer Shanka
· 8 years ago
5eed3c9
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d
by Amith Yamasani
· 8 years ago
b0429bb
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e
by Narayan Kamath
· 8 years ago
77dec89
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3
by Sudheer Shanka
· 8 years ago
9719479
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 am: dfc2d0a4bc -s ours
by Sudheer Shanka
· 8 years ago
75c7391
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours
by Amith Yamasani
· 8 years ago
2490679
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours
by Sudheer Shanka
· 8 years ago
1d513c8
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours
by Amith Yamasani
· 8 years ago
a21569c
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e
by Narayan Kamath
· 8 years ago
8f4f9e4
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624
by Narayan Kamath
· 8 years ago
c2a760e
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58
by Sudheer Shanka
· 8 years ago
603a69f
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
by Sudheer Shanka
· 8 years ago
9080d44
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec
by Amith Yamasani
· 8 years ago
86ac88c
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6
by Sudheer Shanka
· 8 years ago
368ae62
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0
by Amith Yamasani
· 8 years ago
b5760c1
Fetch ga script over https to avoid mixed content.
by Dirk Dougherty
· 8 years ago
184edd6
Merge "Try to mitigate issue #31016187: system_server crash in ArraySet." into nyc-dev
by TreeHugger Robot
· 8 years ago
30cba33
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
by Mark Lu
· 8 years ago
d428a01
Merge "docs: fix broken links in Activity reference" into nyc-dev
by Mark Lu
· 8 years ago
209fb02
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
by Mark Lu
· 8 years ago
a544221
Docs: Fixed the Bluetooth guide link am: 65813dff14
by Hemal Patel
· 8 years ago
dd28b7b
Try to mitigate issue #31016187: system_server crash in ArraySet.
by Dianne Hackborn
· 8 years ago
1c22ae2
docs: Fix typo
by Mark Goldstein
· 8 years ago
2d629c3
docs: Removing non-English /preview/ directories
by Andrew Solovay
· 8 years ago
1fbc4b8
resolve merge conflicts of 5191225 to mnc-dev
by Narayan Kamath
· 8 years ago
77a9ef9
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0 am: dd496ec8b0
by Narayan Kamath
· 8 years ago
9c4d02f
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
by David Christie
· 8 years ago
0ae74a8
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 am: 0777ad8253 am: 187d841b75
by David Christie
· 8 years ago
4f1d1fc
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70 am: a6de8f20c7
by David Christie
· 8 years ago
169f86c
Remove obsolete collections and extras metadata files. Authors should use jd_extras_<lang> instead...
by Dirk Dougherty
· 8 years ago
36246a4
resolve merge conflicts of 8aaffd9 to nyc-dev
by David Christie
· 8 years ago
472a779
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0
by Narayan Kamath
· 8 years ago
80b8f38
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
by David Christie
· 8 years ago
7f2aaf2
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 am: 0777ad8253
by David Christie
· 8 years ago
00e1e39
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70
by David Christie
· 8 years ago
dd496ec
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3
by Narayan Kamath
· 8 years ago
551e6c7
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
by David Christie
· 8 years ago
187d841
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48
by David Christie
· 8 years ago
a6de8f2
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619
by David Christie
· 8 years ago
8aaffd9
resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5 am: e24eb2dbb5
by David Christie
· 8 years ago
8e16811
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04
by Narayan Kamath
· 8 years ago
735699f
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
by David Christie
· 8 years ago
0777ad8
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66
by David Christie
· 8 years ago
3aaac55
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d
by David Christie
· 8 years ago
362668b
resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5 am: e24eb2dbb5
by David Christie
· 8 years ago
e24eb2d
resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5
by David Christie
· 8 years ago
c01db7d
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f
by Narayan Kamath
· 8 years ago
3970ee9
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
by David Christie
· 8 years ago
d610363
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1
by David Christie
· 8 years ago
dd1016c
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d
by David Christie
· 8 years ago
6195acc
resolve merge conflicts of a2399b4 to mnc-dev
by David Christie
· 8 years ago
cdf70ba
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944
by Sudheer Shanka
· 8 years ago
dfc2d0a
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06
by Sudheer Shanka
· 8 years ago
7b81406
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986
by Amith Yamasani
· 8 years ago
26bb7bf
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7
by Sudheer Shanka
· 8 years ago
117a383
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf
by Amith Yamasani
· 8 years ago
5191225
Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47 am: efab128e67 am: 86437ec433
by Narayan Kamath
· 8 years ago
c11e8fc
Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 am: b56f4f53e1 -s ours am: 2984748753 am: b9fae65605
by Narayan Kamath
· 8 years ago
c6ab92e
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f
by Narayan Kamath
· 8 years ago
af369f6e
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
by David Christie
· 8 years ago
975879a
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24
by David Christie
· 8 years ago
ed004e2
Merge "Added error handling to settings suggestions list" into nyc-dev
by Salvador Martinez
· 8 years ago
462f29f
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
by TreeHugger Robot
· 8 years ago
18bf581
Added error handling to settings suggestions list
by Salvador Martinez
· 8 years ago
a2399b4
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
by David Christie
· 8 years ago
b2507eb
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am: 3275a3a5a5 -s ours
by Julius D'souza
· 8 years ago
d5bf403
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
by Julius D'souza
· 8 years ago
77917a8
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
by Scott Main
· 8 years ago
c069ed7
Updated user document for Single-Source RenderScript
by Yang Ni
· 8 years ago
a0994c6
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207 am: 21ef672cab am: e0d1ff1c42 -s ours am: b31a6955a4 -s ours
by Sudheer Shanka
· 8 years ago
52d0f48
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207 am: 21ef672cab am: e0d1ff1c42 -s ours
by Sudheer Shanka
· 8 years ago
f21534a
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9
by Sudheer Shanka
· 8 years ago
6a50270
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours
by Sudheer Shanka
· 8 years ago
b31a695
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207 am: 21ef672cab
by Sudheer Shanka
· 8 years ago
bbbb514
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours
by Sudheer Shanka
· 8 years ago
e0d1ff1
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207
by Sudheer Shanka
· 8 years ago
Next »