OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev
[android-x86/frameworks-base.git]
/
services
/
Android.mk
2016-09-19
Paul Jensen
Merge "Avoid crashing when downloading MitM'd PAC that...
blob
|
commitdiff
2016-09-19
Paul Jensen
Avoid crashing when downloading MitM'd PAC that is...
blob
|
commitdiff
2016-09-19
Paul Jensen
Merge "Avoid crashing when downloading MitM'd PAC that...
blob
|
commitdiff
|
diff to current
2016-09-19
Paul Jensen
Avoid crashing when downloading MitM'd PAC that is...
blob
|
commitdiff
|
diff to current
2016-09-18
Tadashi G. Takaoka
DO NOT MERGE: Catch all exceptions when parsing IME...
blob
|
commitdiff
2016-09-18
Tadashi G. Takaoka
DO NOT MERGE: Catch all exceptions when parsing IME...
blob
|
commitdiff
|
diff to current
2016-09-09
Sungsoo
DO NOT MERGE) ExifInterface: Make saveAttributes throw...
blob
|
commitdiff
2016-09-09
Sungsoo
DO NOT MERGE) ExifInterface: Make saveAttributes throw...
blob
|
commitdiff
|
diff to current
2016-08-22
Sudheer Shanka
DO NOT MERGE: Clean up when recycling a pid with a...
blob
|
commitdiff
2016-08-22
Sudheer Shanka
resolve merge conflicts of 270947f to klp-modular-dev
blob
|
commitdiff
2016-08-22
Sudheer Shanka
DO NOT MERGE: Clean up when recycling a pid with a...
blob
|
commitdiff
|
diff to current
2016-08-19
Sudheer Shanka
resolve merge conflicts of 270947f to klp-modular-dev
blob
|
commitdiff
|
diff to current
2016-08-18
Narayan Kamath
Merge "Process: Fix communication with zygote." into...
blob
|
commitdiff
2016-08-18
Narayan Kamath
Process: Fix communication with zygote. am: 8e69dd2284...
blob
|
commitdiff
2016-08-18
Narayan Kamath
Merge "Process: Fix communication with zygote." into...
blob
|
commitdiff
|
diff to current
2016-08-18
Narayan Kamath
Process: Fix communication with zygote. am: 8e69dd2284
blob
|
commitdiff
|
diff to current
2016-08-12
David Christie
Fix vulnerability where large GPS XTRA data can be...
blob
|
commitdiff
2016-08-11
David Christie
resolve merge conflicts of b4a5615 to lmp-dev
blob
|
commitdiff
2016-08-11
David Christie
Merge "Fix vulnerability where large GPS XTRA data...
blob
|
commitdiff
|
diff to current
2016-08-11
David Christie
Fix vulnerability where large GPS XTRA data can be...
blob
|
commitdiff
|
diff to current
2016-07-29
Sungsoo Lim
DO NOT MERGE: Fix CTS regression am: df17644db7 am...
blob
|
commitdiff
2016-07-29
Sungsoo Lim
DO NOT MERGE: Fix CTS regression am: df17644db7
blob
|
commitdiff
|
diff to current
2016-07-20
Paul Stewart
Merge changes Id25696e4,I939a12a2 into klp-dev am:...
blob
|
commitdiff
2016-07-20
Paul Stewart
Fix string equality comparison am: 1033c6fdbc am: fdd4f...
blob
|
commitdiff
2016-07-20
Paul Stewart
WifiEnterpriseConfiguration: Do not print credentials...
blob
|
commitdiff
2016-07-20
Paul Stewart
Merge changes Id25696e4,I939a12a2 into klp-dev am:...
blob
|
commitdiff
|
diff to current
2016-07-20
Paul Stewart
Fix string equality comparison am: 1033c6fdbc
blob
|
commitdiff
|
diff to current
2016-07-20
Paul Stewart
WifiEnterpriseConfiguration: Do not print credentials...
blob
|
commitdiff
|
diff to current
2016-07-19
Sungsoo Lim
DO NOT MERGE: Remove the use of JHEAD in ExifInterface...
blob
|
commitdiff
2016-07-19
Sungsoo Lim
DO NOT MERGE: Remove the use of JHEAD in ExifInterface...
blob
|
commitdiff
|
diff to current
2016-06-30
fionaxu
DO NOT MERGE revert public api loadSafeLabel am: f44c73...
blob
|
commitdiff
2016-06-30
fionaxu
DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2
blob
|
commitdiff
|
diff to current
2016-06-16
Christopher Tate
DO NOT MERGE: Don\\\'t trust callers to supply app...
blob
|
commitdiff
2016-06-16
Christopher Tate
DO NOT MERGE: Don\\'t trust callers to supply app info...
blob
|
commitdiff
|
diff to current
2016-06-08
fionaxu
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1...
blob
|
commitdiff
2016-06-08
fionaxu
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1
blob
|
commitdiff
|
diff to current
2016-06-07
fionaxu
Backport loadSafeLabel changes am: be2865a60a am: 4c508...
blob
|
commitdiff
2016-06-07
fionaxu
Backport loadSafeLabel changes am: be2865a60a
blob
|
commitdiff
|
diff to current
2016-05-26
Paul Jensen
Merge "Don\'t pass URL path and username/password to...
blob
|
commitdiff
2016-05-26
Paul Jensen
Merge "Don\'t pass URL path and username/password to...
blob
|
commitdiff
|
diff to current
2016-05-19
John Reck
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8...
blob
|
commitdiff
2016-05-19
John Reck
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2
blob
|
commitdiff
|
diff to current
2016-04-11
Todd Kennedy
DO NOT MERGE Fix intent filter priorities am: 60351d3...
blob
|
commitdiff
2016-04-11
Todd Kennedy
DO NOT MERGE Fix intent filter priorities am: 60351d3
blob
|
commitdiff
|
diff to current
2016-02-20
Shreyas Basarge
NPE fix for SyncStorageEngine read authority am: a962d9...
blob
|
commitdiff
2016-02-20
Shreyas Basarge
NPE fix for SyncStorageEngine read authority am: a962d9eba7
blob
|
commitdiff
|
diff to current
2016-01-21
Matthew Williams
DO NOT MERGE Redact Account info from getCurrentSyncs...
blob
|
commitdiff
2016-01-21
Matthew Williams
DO NOT MERGE Redact Account info from getCurrentSyncs...
blob
|
commitdiff
|
diff to current
2015-11-13
Shreyas Basarge
Sync extras bundle comparison can throw NPE am: 2f137b7...
blob
|
commitdiff
2015-11-13
Shreyas Basarge
Sync extras bundle comparison can throw NPE am: 2f137b7705
blob
|
commitdiff
|
diff to current
2015-09-17
Zach Jang
am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO...
blob
|
commitdiff
2015-09-17
Zach Jang
am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of...
blob
|
commitdiff
|
diff to current
2015-08-21
Sebastien Hertz
am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow...
blob
|
commitdiff
2015-08-21
Sebastien Hertz
am 9e7a0ddb: am 18089ceb: Allow debugging only for...
blob
|
commitdiff
|
diff to current
2015-07-01
Wale Ogunwale
am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent...
blob
|
commitdiff
2015-07-01
Wale Ogunwale
am c215b2b2: am dc9cfca8: Merge "Prevent system uid...
blob
|
commitdiff
|
diff to current
2015-06-30
Amit Mahajan
am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO...
blob
|
commitdiff
2015-06-30
Joe Fernandez
am 765255b4: am 6f8dab04: Merge "Fixes a typo where...
blob
|
commitdiff
2015-06-26
Amit Mahajan
am eee86342: am 9edf7ad5: DO NOT MERGE Change to add...
blob
|
commitdiff
|
diff to current
2015-06-02
Leon Scroggins III
am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO...
blob
|
commitdiff
2015-06-02
Leon Scroggins III
am 7496e153: am 0d208173: DO NOT MERGE: Ensure that...
blob
|
commitdiff
|
diff to current
2015-05-27
Leon Scroggins III
am 425d7c87: (-s ours) am 11297581: am 18d79267: Check...
blob
|
commitdiff
2015-05-27
Leon Scroggins III
am 11297581: am 18d79267: Check that the parcel contain...
blob
|
commitdiff
|
diff to current
2015-04-23
Leon Scroggins III
am ee35410f: (-s ours) am a7501119: am 69b8e962: Make...
blob
|
commitdiff
2015-04-23
Leon Scroggins III
am a7501119: am 69b8e962: Make Bitmap_createFromParcel...
blob
|
commitdiff
|
diff to current
2015-01-31
Jon Larimer
am 545dd853: am 9a425aa7: am 159aa735: am d4031809...
blob
|
commitdiff
2015-01-30
Jon Larimer
am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735...
blob
|
commitdiff
2015-01-30
Jon Larimer
am 545dd853: am 9a425aa7: am 159aa735: am d4031809...
blob
|
commitdiff
|
diff to current
2015-01-29
Jon Larimer
am 88add689: am a5ccca24: am 2982d648: am de9a76ed...
blob
|
commitdiff
2015-01-29
Jon Larimer
am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am...
blob
|
commitdiff
2015-01-29
Jon Larimer
am ea63fd7f: am 88add689: am a5ccca24: am 2982d648...
blob
|
commitdiff
2015-01-29
Jon Larimer
am 48dad949: (-s ours) am a43742ec: am 6813f29e: am...
blob
|
commitdiff
2015-01-29
Jon Larimer
am 88add689: am a5ccca24: am 2982d648: am de9a76ed...
blob
|
commitdiff
|
diff to current
2015-01-29
Jon Larimer
am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am...
blob
|
commitdiff
|
diff to current
2015-01-29
Jon Larimer
am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore...
blob
|
commitdiff
2015-01-29
Jon Larimer
am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge...
blob
|
commitdiff
2015-01-29
Jon Larimer
am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore...
blob
|
commitdiff
|
diff to current
2015-01-28
Leon Scroggins III
am 1dbbc204: am 6106f6a4: am 93522968: am 01287549...
blob
|
commitdiff
2015-01-27
Leon Scroggins III
am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968...
blob
|
commitdiff
2015-01-27
Leon Scroggins III
am 1dbbc204: am 6106f6a4: am 93522968: am 01287549...
blob
|
commitdiff
|
diff to current
2015-01-20
Ricardo Cervera
am 98f07d90: am 92f6a747: docs: Added info on noHistory...
blob
|
commitdiff
2015-01-16
Ricardo Cervera
resolved conflicts for merge of e8f6bd48 to lmp-dev
blob
|
commitdiff
2015-01-16
Ricardo Cervera
am 98f07d90: am 92f6a747: docs: Added info on noHistory...
blob
|
commitdiff
|
diff to current
2015-01-10
Deepanshu Gupta
am 74147527: am 8505c387: Special case AppCompat to...
blob
|
commitdiff
2015-01-10
Deepanshu Gupta
Support Locale.toLanguageTag on Java 6 automerge: dbd64f7
blob
|
commitdiff
2015-01-10
Deepanshu Gupta
LayoutLib: Fix System.arraycopy() automerge: 51fb775
blob
|
commitdiff
2015-01-10
Deepanshu Gupta
am bb600de6: am 74147527: am 8505c387: Special case...
blob
|
commitdiff
2015-01-10
Deepanshu Gupta
am dbd64f7c: (-s ours) Support Locale.toLanguageTag...
blob
|
commitdiff
2015-01-10
Deepanshu Gupta
am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()
blob
|
commitdiff
2015-01-10
Deepanshu Gupta
am 74147527: am 8505c387: Special case AppCompat to...
blob
|
commitdiff
|
diff to current
2014-11-11
Eric Laurent
am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04...
blob
|
commitdiff
2014-11-10
Eric Laurent
am 8db769dd: am df878bd3: am ced2f74a: am e8c1a97f...
blob
|
commitdiff
2014-11-10
Eric Laurent
am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04...
blob
|
commitdiff
|
diff to current
2014-11-07
Ricardo Cervera
am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case...
blob
|
commitdiff
2014-11-07
Tom Taylor
am 7c570346: am 47419a44: am 192a3904: am 23fb2972...
blob
|
commitdiff
2014-11-07
Tom Taylor
am 52449372: am bc57a1f8: Externally Reported Moderate...
blob
|
commitdiff
2014-11-06
Ricardo Cervera
am 58dc8c42: am e7cd5f2e: Merge "docs: Add API_UNAVAILA...
blob
|
commitdiff
2014-11-05
Tom Taylor
am 6209d4e4: am 7c570346: am 47419a44: am 192a3904...
blob
|
commitdiff
2014-11-05
Tom Taylor
am db864e4d: am 52449372: am bc57a1f8: Externally Repor...
blob
|
commitdiff
2014-11-04
Tom Taylor
am 7c570346: am 47419a44: am 192a3904: am 23fb2972...
blob
|
commitdiff
|
diff to current
next