Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
frameworks
/
base
/
0460e26a4c9915f77c915d2cc3540969802b02fa
0460e26
resolved conflicts for merge of 691be97f to gingerbread-plus-aosp
by Jean-Baptiste Queru
· 14 years ago
d903487
am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.
by Wink Saville
· 14 years ago
b2cc86d
am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.
by Wink Saville
· 14 years ago
3158cf6
Change CDMAPhone.getDeviceId to return MEID or ESN.
by Wink Saville
· 14 years ago
691be97
Merge "add new sensor types for handling gyro data and device orientation more efficiently."
by Jean-Baptiste Queru
· 14 years ago
b13c9bc
manual merge
by Jean-Baptiste Queru
· 14 years ago
5a14271
am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread
by Romain Guy
· 14 years ago
d6f7f22
Merge "Load bitmaps in the correct format." into gingerbread
by Romain Guy
· 14 years ago
f92a0a6
Load bitmaps in the correct format.
by Romain Guy
· 14 years ago
32f510e
Merge "BluetoothHeadset.java: Added ACTION_VENDOR_SPECIFIC_HEADSET_EVENT, EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD, EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_ARGS."
by Jean-Baptiste Queru
· 14 years ago
485de78
am 06c81f29: Merge changes I8a257579,I82d16312 into gingerbread
by Kenny Root
· 14 years ago
06c81f2
Merge changes I8a257579,I82d16312 into gingerbread
by Kenny Root
· 14 years ago
701b710
am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread
by Nipun Kwatra
· 14 years ago
300b0b7
Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread
by Nipun Kwatra
· 14 years ago
a3ece8b
am 32519259: Merge "Fix a few small battery stats problems:" into gingerbread
by Dianne Hackborn
· 14 years ago
3251925
Merge "Fix a few small battery stats problems:" into gingerbread
by Dianne Hackborn
· 14 years ago
fb45748
setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
by Nipun Kwatra
· 14 years ago
005f0d0
am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread
by Brian Carlstrom
· 14 years ago
4d42ccd
Tracking merge of dalvik-dev to gingerbread
by Brian Carlstrom
· 14 years ago
99d0452
Fix a few small battery stats problems:
by Dianne Hackborn
· 14 years ago
8b569c8
am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gingerbread
by Dianne Hackborn
· 14 years ago
42f90ca
Merge "Fix aapt dump badging to support xlarge screens." into gingerbread
by Dianne Hackborn
· 14 years ago
086d084
Add AStorageManager API to NDK
by Kenny Root
· 14 years ago
b90b9d5
am 6be23712: Merge "Free created FileMap when uncompressing files" into gingerbread
by Kenny Root
· 14 years ago
be857d4
Reorganize MountService IPC
by Kenny Root
· 14 years ago
6be2371
Merge "Free created FileMap when uncompressing files" into gingerbread
by Kenny Root
· 14 years ago
c5794ae
am baf72cd7: Merge "DO NOT MERGE 2928156 Accessibility event\'s parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread
by Dianne Hackborn
· 14 years ago
baf72cd
Merge "DO NOT MERGE 2928156 Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread
by Dianne Hackborn
· 14 years ago
f43489d
Fix aapt dump badging to support xlarge screens.
by Dianne Hackborn
· 14 years ago
2b05a95
am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread
by Robert Greenwalt
· 14 years ago
4b1bdc0
Merge "DO NOT MERGE Fixing Connectivity" into gingerbread
by Robert Greenwalt
· 14 years ago
5474b0f
am 39792d22: Fix bugs with granting permissions through onNewIntent().
by Dianne Hackborn
· 14 years ago
39792d2
Fix bugs with granting permissions through onNewIntent().
by Dianne Hackborn
· 14 years ago
3fc0152
am b755e325: Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread
by James Dong
· 14 years ago
b755e32
Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread
by James Dong
· 14 years ago
346b612
am 97a56269: Merge "Add camera fps range API." into gingerbread
by Wu-cheng Li
· 14 years ago
97a5626
Merge "Add camera fps range API." into gingerbread
by Wu-cheng Li
· 14 years ago
454630f
Add camera fps range API.
by Wu-cheng Li
· 14 years ago
8afddad
DO NOT MERGE Fixing Connectivity
by Robert Greenwalt
· 14 years ago
d93ecb3
am 581f7861: DO NOT MERGE Refactor find and select dialogs
by Cary Clark
· 14 years ago
581f786
DO NOT MERGE Refactor find and select dialogs
by Cary Clark
· 14 years ago
7e8f0c7
am b9a17931: Merge "SipSession: make potential time-consuming ops run on background thread" into gingerbread
by Hung-ying Tyan
· 14 years ago
b9a1793
Merge "SipSession: make potential time-consuming ops run on background thread" into gingerbread
by Hung-ying Tyan
· 14 years ago
6cf5eb0
am 3f677b1b: Merge "Fix periodically disappearing status icons." into gingerbread
by Daniel Sandler
· 14 years ago
3f677b1
Merge "Fix periodically disappearing status icons." into gingerbread
by Daniel Sandler
· 14 years ago
3a59ddc
am dc2eabd1: Merge "Don\'t recycle native bitmap after the finalizer is called." into gingerbread
by Chih-Chung Chang
· 14 years ago
dc2eabd
Merge "Don't recycle native bitmap after the finalizer is called." into gingerbread
by Chih-Chung Chang
· 14 years ago
dba514c
SipSession: make potential time-consuming ops run on background thread
by Hung-ying Tyan
· 14 years ago
966803a
Don't recycle native bitmap after the finalizer is called.
by Chih-Chung Chang
· 14 years ago
caaf7fe
am 271c1bfd: Merge "Handle the camera open failure better." into gingerbread
by Wu-cheng Li
· 14 years ago
271c1bf
Merge "Handle the camera open failure better." into gingerbread
by Wu-cheng Li
· 14 years ago
e704438
Handle the camera open failure better.
by Wu-cheng Li
· 14 years ago
9767dbf
Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
by James Dong
· 14 years ago
52b8235
Free created FileMap when uncompressing files
by Kenny Root
· 14 years ago
6bacd9c
am 2f6d975b: Minor MotionEvent optimization.
by Jeff Brown
· 14 years ago
2f6d975
Minor MotionEvent optimization.
by Jeff Brown
· 14 years ago
d457053
am 07936528: Merge "Cosmetic cleanups to SMSDispatcher classes." into gingerbread
by Jake Hamby
· 14 years ago
0793652
Merge "Cosmetic cleanups to SMSDispatcher classes." into gingerbread
by Jake Hamby
· 14 years ago
3a91abc
am d3aaad0e: Merge "Use getMinFrameCount() instead of querying AudioSystem directly." into gingerbread
by Chia-chi Yeh
· 14 years ago
d3aaad0
Merge "Use getMinFrameCount() instead of querying AudioSystem directly." into gingerbread
by Chia-chi Yeh
· 14 years ago
3540760
am 0ea4ed3b: Don\'t drop a late frame which may lead to missing I frames in the MP4 file
by James Dong
· 14 years ago
177a7ad
am 439fe407: Merge "Return error from MPEG4Writer stop() if the check on codec specific data failed" into gingerbread
by James Dong
· 14 years ago
0ea4ed3
Don't drop a late frame which may lead to missing I frames in the MP4 file
by James Dong
· 14 years ago
439fe40
Merge "Return error from MPEG4Writer stop() if the check on codec specific data failed" into gingerbread
by James Dong
· 14 years ago
a842d14
am d018a0ce: Merge "Text selection without trackball." into gingerbread
by Gilles Debunne
· 14 years ago
d018a0c
Merge "Text selection without trackball." into gingerbread
by Gilles Debunne
· 14 years ago
059fe88
Cosmetic cleanups to SMSDispatcher classes.
by Jake Hamby
· 14 years ago
bb8d314
am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
by Scott Main
· 14 years ago
70c9ffb
am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
by Scott Main
· 14 years ago
11a7248
Merge "docs: add links from widget classes to tutorials" into froyo
by Scott Main
· 14 years ago
41ec653
docs: add links from widget classes to tutorials
by Scott Main
· 14 years ago
b0d6ba1
Text selection without trackball.
by Gilles Debunne
· 14 years ago
bbe5fb2
am 189de282: Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread
by Gilles Debunne
· 14 years ago
189de28
Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread
by Gilles Debunne
· 14 years ago
9a5c6e4
am 18ef3725: DO NOT MERGE. Fix the build.
by Romain Guy
· 14 years ago
18ef3725
DO NOT MERGE. Fix the build.
by Romain Guy
· 14 years ago
7539968
Fix for a Resource system bug that displayed the wrong name for missing asset.
by Gilles Debunne
· 14 years ago
d88e068
am 288471d8: DO NOT MERGE. Load assets in place instead of deferring until draw.
by Romain Guy
· 14 years ago
288471d
DO NOT MERGE. Load assets in place instead of deferring until draw.
by Romain Guy
· 14 years ago
36c051c
am a695cbc9: am 0fe27cf5: make android_id random seed depend on time as well as ro.serialno
by Doug Zongker
· 14 years ago
a695cbc
am 0fe27cf5: make android_id random seed depend on time as well as ro.serialno
by Doug Zongker
· 14 years ago
62948fa
Return error from MPEG4Writer stop() if the check on codec specific data failed
by James Dong
· 14 years ago
c8d2fa7
am cbd038fe: Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
by James Dong
· 14 years ago
cbd038f
Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
by James Dong
· 14 years ago
0398bf7
Fix periodically disappearing status icons.
by Daniel Sandler
· 14 years ago
a90a1e5
am 545eab8a: Merge "remove unused pixel format" into gingerbread
by Mathias Agopian
· 14 years ago
0fe27cf
make android_id random seed depend on time as well as ro.serialno
by Doug Zongker
· 14 years ago
545eab8
Merge "remove unused pixel format" into gingerbread
by Mathias Agopian
· 14 years ago
d036662
Make MediaWriter stop and pause return errors if necessary
by James Dong
· 14 years ago
d7d58be
am 00144745: Merge "Make the throttling more sensitive to end-to-end latency." into gingerbread
by Jeff Brown
· 14 years ago
0014474
Merge "Make the throttling more sensitive to end-to-end latency." into gingerbread
by Jeff Brown
· 14 years ago
0f4d7bc
Make the throttling more sensitive to end-to-end latency.
by Jeff Brown
· 14 years ago
e509328
remove unused pixel format
by Mathias Agopian
· 14 years ago
b3aaf3b
am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread
by Mathias Agopian
· 14 years ago
bccfcd9
Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread
by Mathias Agopian
· 14 years ago
873ebfb
am 223e4f73: Merge "Support for MP4V-ES packetization format according to RFC3016." into gingerbread
by Andreas Huber
· 14 years ago
223e4f7
Merge "Support for MP4V-ES packetization format according to RFC3016." into gingerbread
by Andreas Huber
· 14 years ago
a979ad6
Support for MP4V-ES packetization format according to RFC3016.
by Andreas Huber
· 14 years ago
6694c71
am eba12749: Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" into gingerbread
by Wu-cheng Li
· 14 years ago
9ba1ed6
am ccb91596: Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread
by Wu-cheng Li
· 14 years ago
Next »