Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
frameworks
/
base
/
df3f2e6fdd94f6d31b925ad9122c0fd6285ccc28
/
core
114ef30
resolved conflicts for merge of f3da5dc7 to master
by Selim Cinek
· 9 years ago
15bb40a
Merge "Add callback-based support for Hardware Activity Recognition. b/17112184"
by Daniel Estrada Alva
· 9 years ago
917e5c0
Merge "Fixing non-delivering of DRAG_START event to each view"
by Vadim Tryshev
· 9 years ago
6e2fe75
Add callback-based support for Hardware Activity Recognition. b/17112184
by destradaa
· 9 years ago
16478a8
am 7eec4216: am 04f61ee8: am f040100c: am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
by Jorim Jaggi
· 9 years ago
7eec421
am 04f61ee8: am f040100c: am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
by Jorim Jaggi
· 9 years ago
04f61ee
am f040100c: am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
by Jorim Jaggi
· 9 years ago
f040100
am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
by Jorim Jaggi
· 9 years ago
6a60196
am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
by Jorim Jaggi
· 9 years ago
8e1ae26
am 6c3fc22c: am 5a70e76f: am 53a82e35: am 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
by Chris Craik
· 9 years ago
f244b3a
am 4a30f4d8: am 95e51b84: am 5821d548: am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
by Phil Burk
· 9 years ago
9e49b5d
Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
by Jorim Jaggi
· 9 years ago
6c3fc22
am 5a70e76f: am 53a82e35: am 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
by Chris Craik
· 9 years ago
4a30f4d
am 95e51b84: am 5821d548: am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
by Phil Burk
· 9 years ago
5a70e76
am 53a82e35: am 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
by Chris Craik
· 9 years ago
95e51b8
am 5821d548: am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
by Phil Burk
· 9 years ago
765fed1
am cd183953: am 15a4320e: am 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev
by Tim Volodine
· 9 years ago
53a82e35
am 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
by Chris Craik
· 9 years ago
5821d54
am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
by Phil Burk
· 9 years ago
cd18395
am 15a4320e: am 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev
by Tim Volodine
· 9 years ago
520a5c5
am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
by Chris Craik
· 9 years ago
21fdbd9
am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
by Phil Burk
· 9 years ago
4604c1d
Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
by Chris Craik
· 9 years ago
fef1b28
Merge "MIDI: fix running status parser" into mnc-dev
by Phil Burk
· 9 years ago
15a4320
am 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev
by Tim Volodine
· 9 years ago
2f6d674
am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev
by Tim Volodine
· 9 years ago
91b31b5
Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev
by Tim Volodine
· 9 years ago
4961105
Revert "Invoke geolocation permissions callback with denied state by default."
by Tim Volodine
· 9 years ago
87a2875
am a3a53c6b: am 447009e3: am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
by Chris Wren
· 9 years ago
a3a53c6
am 447009e3: am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
by Chris Wren
· 9 years ago
457672d
Merge "switch to new signature for NewWithProc"
by Derek Sollenberger
· 9 years ago
447009e
am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
by Chris Wren
· 9 years ago
eae9d6d
am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
by Chris Wren
· 9 years ago
3dad6c6
am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
by Chris Wren
· 9 years ago
45a0bb1
Merge "add ticker to enqueue message for easier debugging" into mnc-dev
by Chris Wren
· 9 years ago
a0d9a63
Follow refactoring when enforcing permissions.
by Jeff Sharkey
· 9 years ago
f3230a7
am 43b379e7: am 43ff3afe: am 4c864be1: am 35f4b6a2: am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev
by Jeff Sharkey
· 9 years ago
43b379e
am 43ff3afe: am 4c864be1: am 35f4b6a2: am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev
by Jeff Sharkey
· 9 years ago
43ff3af
am 4c864be1: am 35f4b6a2: am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev
by Jeff Sharkey
· 9 years ago
4c864be
am 35f4b6a2: am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev
by Jeff Sharkey
· 9 years ago
a2217d6
Import translations. DO NOT MERGE
by Geoff Mendal
· 9 years ago
0eca40d
Import translations. DO NOT MERGE
by Geoff Mendal
· 9 years ago
35f4b6a
am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev
by Jeff Sharkey
· 9 years ago
8be305d
Merge "Also check app-ops on path-permissions." into mnc-dev
by Jeff Sharkey
· 9 years ago
3e0c1c4
am d1fffe1c: am 505a252c: am 851f5185: am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev
by Andreas Gampe
· 9 years ago
d1fffe1
am 505a252c: am 851f5185: am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev
by Andreas Gampe
· 9 years ago
6260b22
Fix bitmap get/set pixels for ALPHA_8
by Chris Craik
· 9 years ago
0e621c3
Also check app-ops on path-permissions.
by Jeff Sharkey
· 9 years ago
505a252
am 851f5185: am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev
by Andreas Gampe
· 9 years ago
851f518
am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev
by Andreas Gampe
· 9 years ago
08edf24
am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev
by Andreas Gampe
· 9 years ago
9a755e3
Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev
by Andreas Gampe
· 9 years ago
e608250
Frameworks/base: Hand fingerprint to ART
by Andreas Gampe
· 9 years ago
98e94aea
MIDI: fix running status parser
by Phil Burk
· 9 years ago
58b2d33
am 0b9624d4: am 98961ea0: am 7385aca1: am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev
by Robert Greenwalt
· 9 years ago
0b9624d
am 98961ea0: am 7385aca1: am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev
by Robert Greenwalt
· 9 years ago
98961ea
am 7385aca1: am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev
by Robert Greenwalt
· 9 years ago
7385aca
am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev
by Robert Greenwalt
· 9 years ago
f0bead2
Merge "DO NOT MERGE Enhance local log." into mnc-dev
by Robert Greenwalt
· 9 years ago
dd6f844
DO NOT MERGE Enhance local log.
by Robert Greenwalt
· 9 years ago
585307a
Merge "Annotate Intent and ContentResolver params with @RequiresPermission"
by Tor Norbye
· 9 years ago
55f08bc
am f8480f52: am 20295341: am 31006d92: am afad464c: am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev
by Andrei Stingaceanu
· 9 years ago
f8480f5
am 20295341: am 31006d92: am afad464c: am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev
by Andrei Stingaceanu
· 9 years ago
2f02dc5
switch to new signature for NewWithProc
by Mike Reed
· 9 years ago
2029534
am 31006d92: am afad464c: am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev
by Andrei Stingaceanu
· 9 years ago
31006d9
am afad464c: am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev
by Andrei Stingaceanu
· 9 years ago
afad464
am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev
by Andrei Stingaceanu
· 9 years ago
4579491
Merge "Disallow dragging text in extracted mode" into mnc-dev
by Andrei Stingaceanu
· 9 years ago
2c24b88
Merge "Remove UsbStorageActivity, which is no longer used."
by Yasuhiro Matsuda
· 9 years ago
225c8f9
am 5703cd54: am 72d9a4df: am 56e1be70: am ecfbd588: am abd35bfc: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
by Jim Miller
· 9 years ago
d78a5c7
am ba8435cb: am 5ad07ce0: am b621b71c: am ae5569de: am eea9892d: Merge "UICC : discard language setting of SIM" into mnc-dev
by Amit Mahajan
· 9 years ago
fb8cfd8
am c99ecb34: am c0e0b1e3: am 646f9da9: am 4ff108f0: am 0526ee52: Merge "Don\'t rely on broadcast intent for waking up input method." into mnc-dev
by Yohei Yukawa
· 9 years ago
5cdca2a
am cb731204: am ce4668b6: am 3fce45b6: am 54f1db79: am 607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev
by Svetoslav Ganov
· 9 years ago
9bec966
am 7ddfc7b0: am 1c37dc81: am dd12420e: am f9044dcc: am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
by Svetoslav Ganov
· 9 years ago
809f24d
am 5ffab5f6: am 18046b72: am e77b00ce: am e1ebca6c: am 859551f7: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev
by Junda Liu
· 9 years ago
e3a1ea1
am b365dff5: am bd3d9a0d: am 86f88bc4: am b572b950: am 4a368659: Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev
by Dianne Hackborn
· 9 years ago
e8a70aa
am 556aa7dc: am 00e9e97f: am 47fefc5c: am a45fc6e2: am 5507bb41: Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev
by Dianne Hackborn
· 9 years ago
a30cb27
am cec9ac5c: am 71fa8e19: am 059841e2: am 586116a5: am 41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev
by Svetoslav Ganov
· 9 years ago
61fe8e0
am 1298b1a0: am 1ad413c0: am af27474f: am cc3c6dbf: am 3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev
by Svetoslav Ganov
· 9 years ago
e4e691b
am a0d43c31: am 602d71db: am 898e3dda: am 92638a0c: am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev
by Adam Lesinski
· 9 years ago
1b4acc8
am 444883e9: am 35b1674a: am 9b4917a6: am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
by Alan Viverette
· 9 years ago
21574a2
am aa32a0b5: am 5192e4b2: am 030f2735: am 2a37b2ff: am 5ef70b02: Merge "Added a note about location permission" into mnc-dev
by Fyodor Kupolov
· 9 years ago
ebc30c0
am 261b6942: am b76cc910: am 4a4e0647: am 13bb6812: am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
by xin He
· 9 years ago
5b98249
am 5080e90a: am aebcf3b7: am 23fdb635: am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
by Jeff Sharkey
· 9 years ago
180dff0
am bb8b0368: am dea13a96: am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
by Jason Monk
· 9 years ago
96cc2b3
am 1d8b0a29: am 14aca8e8: am 63ff4a77: am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev
by Dianne Hackborn
· 9 years ago
5703cd5
am 72d9a4df: am 56e1be70: am ecfbd588: am abd35bfc: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
by Jim Miller
· 9 years ago
ba8435c
am 5ad07ce0: am b621b71c: am ae5569de: am eea9892d: Merge "UICC : discard language setting of SIM" into mnc-dev
by Amit Mahajan
· 9 years ago
c99ecb34
am c0e0b1e3: am 646f9da9: am 4ff108f0: am 0526ee52: Merge "Don\'t rely on broadcast intent for waking up input method." into mnc-dev
by Yohei Yukawa
· 9 years ago
cb73120
am ce4668b6: am 3fce45b6: am 54f1db79: am 607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev
by Svetoslav Ganov
· 9 years ago
7ddfc7b
am 1c37dc81: am dd12420e: am f9044dcc: am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
by Svetoslav Ganov
· 9 years ago
5ffab5f
am 18046b72: am e77b00ce: am e1ebca6c: am 859551f7: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev
by Junda Liu
· 9 years ago
b365dff
am bd3d9a0d: am 86f88bc4: am b572b950: am 4a368659: Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev
by Dianne Hackborn
· 9 years ago
556aa7d
am 00e9e97f: am 47fefc5c: am a45fc6e2: am 5507bb41: Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev
by Dianne Hackborn
· 9 years ago
cec9ac5
am 71fa8e19: am 059841e2: am 586116a5: am 41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev
by Svetoslav Ganov
· 9 years ago
1298b1a
am 1ad413c0: am af27474f: am cc3c6dbf: am 3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev
by Svetoslav Ganov
· 9 years ago
a0d43c3
am 602d71db: am 898e3dda: am 92638a0c: am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev
by Adam Lesinski
· 9 years ago
444883e
am 35b1674a: am 9b4917a6: am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
by Alan Viverette
· 9 years ago
aa32a0b
am 5192e4b2: am 030f2735: am 2a37b2ff: am 5ef70b02: Merge "Added a note about location permission" into mnc-dev
by Fyodor Kupolov
· 9 years ago
261b694
am b76cc910: am 4a4e0647: am 13bb6812: am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
by xin He
· 9 years ago
Next »