ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
17,851 Commits 2 Branches 0 Tags 54 MiB
9609a82a45
Commit Graph

17851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
d305b56314 am ec58dff0: Fix build - remove dead doc link 
Merge commit 'ec58dff06693342f12f295fdb7b41cfcbaeb4f14' into gingerbread-plus-aosp

* commit 'ec58dff06693342f12f295fdb7b41cfcbaeb4f14':
  Fix build - remove dead doc link
 2010-08-20 17:54:33 -07:00
Jean-Baptiste Queru
077e5b6a72 resolved conflicts for merge of 691be97f to gingerbread-plus-aosp 
Change-Id: Ic095e7f9203eb1465ddf3c195ebf1200e9393124
 2010-08-20 17:16:37 -07:00
Wink Saville
d3f1b28724 am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN. 
Merge commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e' into gingerbread-plus-aosp

* commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e':
  Change CDMAPhone.getDeviceId to return MEID or ESN.
 2010-08-20 16:37:21 -07:00
Wink Saville
f6ad16c48e am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN. 
Merge commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b' into gingerbread

* commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b':
  Change CDMAPhone.getDeviceId to return MEID or ESN.
 2010-08-20 16:34:16 -07:00
Jean-Baptiste Queru
5dda1d9245 Merge "add new sensor types for handling gyro data and device orientation more efficiently." 2010-08-20 16:21:11 -07:00
Jean-Baptiste Queru
a10ea3b34e manual merge 
Change-Id: Ib92a75958b857277e17f4bd0bee75744c653c942
 2010-08-20 15:58:49 -07:00
Romain Guy
d86edf589d am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread 
Merge commit 'd6f7f225689ecd33dc54699acc01cfafc781c20d' into gingerbread-plus-aosp

* commit 'd6f7f225689ecd33dc54699acc01cfafc781c20d':
  Load bitmaps in the correct format.
 2010-08-20 15:45:09 -07:00
Romain Guy
fa141f3ac5 Merge "Load bitmaps in the correct format." into gingerbread 2010-08-20 15:43:11 -07:00
Jean-Baptiste Queru
1e532b6b34 Merge "BluetoothHeadset.java: Added ACTION_VENDOR_SPECIFIC_HEADSET_EVENT, EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD, EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_ARGS." 2010-08-20 15:22:33 -07:00
Kenny Root
0b8ebfc158 am 06c81f29: Merge changes I8a257579,I82d16312 into gingerbread 
Merge commit '06c81f29a61ad3568a77f111b6be93e1f437f5bd' into gingerbread-plus-aosp

* commit '06c81f29a61ad3568a77f111b6be93e1f437f5bd':
  Add AStorageManager API to NDK
  Reorganize MountService IPC
 2010-08-20 15:09:58 -07:00
Kenny Root
f9ef0e9286 Merge changes I8a257579,I82d16312 into gingerbread 
* changes:
  Add AStorageManager API to NDK
  Reorganize MountService IPC
 2010-08-20 15:07:34 -07:00
Nipun Kwatra
f36bcf4921 am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread 
Merge commit '300b0b7e2b8f0ab922e4a83755ae999da191894e' into gingerbread-plus-aosp

* commit '300b0b7e2b8f0ab922e4a83755ae999da191894e':
  setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
 2010-08-20 14:18:08 -07:00
Nipun Kwatra
24a3b041dd Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread 2010-08-20 14:16:08 -07:00
Dianne Hackborn
87544b19e1 am 32519259: Merge "Fix a few small battery stats problems:" into gingerbread 
Merge commit '325192593b057f4360e1abddf490b4fae7d60b12' into gingerbread-plus-aosp

* commit '325192593b057f4360e1abddf490b4fae7d60b12':
  Fix a few small battery stats problems:
 2010-08-20 14:13:22 -07:00
Dianne Hackborn
2b718b6cea Merge "Fix a few small battery stats problems:" into gingerbread 2010-08-20 14:10:41 -07:00
Brian Carlstrom
c5b8ae8dce am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread 
Merge commit '4d42ccd1579da53aaaf132a6ad26a06e2baa5b98' into gingerbread-plus-aosp

* commit '4d42ccd1579da53aaaf132a6ad26a06e2baa5b98':
  Tracking merge of dalvik-dev to gingerbread
 2010-08-20 13:54:28 -07:00
Dianne Hackborn
8911b2add8 am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gingerbread 
Merge commit '42f90ca54fc4c6e0bdbde7caa7d10b6090d11960' into gingerbread-plus-aosp

* commit '42f90ca54fc4c6e0bdbde7caa7d10b6090d11960':
  Fix aapt dump badging to support xlarge screens.
 2010-08-20 13:42:25 -07:00
Dianne Hackborn
eedeeb877f Merge "Fix aapt dump badging to support xlarge screens." into gingerbread 2010-08-20 13:39:30 -07:00
Kenny Root
7ba25c758b am 6be23712: Merge "Free created FileMap when uncompressing files" into gingerbread 
Merge commit '6be237120e9673e3cfc5243da5bbca287effcf09' into gingerbread-plus-aosp

* commit '6be237120e9673e3cfc5243da5bbca287effcf09':
  Free created FileMap when uncompressing files
 2010-08-20 13:18:22 -07:00
Kenny Root
e6d429c49b Merge "Free created FileMap when uncompressing files" into gingerbread 2010-08-20 13:16:20 -07:00
Dianne Hackborn
0ba08fc343 am baf72cd7: Merge "DO NOT MERGE 2928156 Accessibility event\'s parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread 
Merge commit 'baf72cd79c2a675c2265384eb704067ab24259a7' into gingerbread-plus-aosp

* commit 'baf72cd79c2a675c2265384eb704067ab24259a7':
  DO NOT MERGE 2928156  Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)
 2010-08-20 12:55:29 -07:00
Dianne Hackborn
047dca2130 Merge "DO NOT MERGE 2928156 Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread 2010-08-20 12:53:07 -07:00
Robert Greenwalt
ee4acc3923 am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread 
Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp

* commit '4b1bdc0209650436ebe0dad1020080cc891e97b6':
  DO NOT MERGE Fixing Connectivity
 2010-08-20 12:04:07 -07:00
Robert Greenwalt
d18227e5ce Merge "DO NOT MERGE Fixing Connectivity" into gingerbread 2010-08-20 12:01:56 -07:00
Dianne Hackborn
ffc04b3da6 am 39792d22: Fix bugs with granting permissions through onNewIntent(). 
Merge commit '39792d2262352ae775091876d5488d2412a2ff92' into gingerbread-plus-aosp

* commit '39792d2262352ae775091876d5488d2412a2ff92':
  Fix bugs with granting permissions through onNewIntent().
 2010-08-20 11:53:29 -07:00
James Dong
be601e1ca4 am b755e325: Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread 
Merge commit 'b755e3256510ecd325565d6b461d668d224445b1' into gingerbread-plus-aosp

* commit 'b755e3256510ecd325565d6b461d668d224445b1':
  Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
 2010-08-20 11:41:49 -07:00
James Dong
67b7606479 Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread 2010-08-20 11:39:29 -07:00
Wu-cheng Li
d2a946ad87 am 97a56269: Merge "Add camera fps range API." into gingerbread 
Merge commit '97a56269d06770712f9da7a2a29385012ec9714e' into gingerbread-plus-aosp

* commit '97a56269d06770712f9da7a2a29385012ec9714e':
  Add camera fps range API.
 2010-08-20 11:21:37 -07:00
Wu-cheng Li
0968942116 Merge "Add camera fps range API." into gingerbread 2010-08-20 11:19:51 -07:00
Cary Clark
e7b672c8ab am 581f7861: DO NOT MERGE Refactor find and select dialogs 
Merge commit '581f78615a9dc65ee264b3619ef6cdd0b0e8355c' into gingerbread-plus-aosp

* commit '581f78615a9dc65ee264b3619ef6cdd0b0e8355c':
  DO NOT MERGE Refactor find and select dialogs
 2010-08-20 09:33:10 -07:00
Hung-ying Tyan
2e385579a6 am b9a17931: Merge "SipSession: make potential time-consuming ops run on background thread" into gingerbread 
Merge commit 'b9a1793195853d6f4a8656d029f0ab47a544d31d' into gingerbread-plus-aosp

* commit 'b9a1793195853d6f4a8656d029f0ab47a544d31d':
  SipSession: make potential time-consuming ops run on background thread
 2010-08-20 08:34:17 -07:00
Hung-ying Tyan
20fbd0edcf Merge "SipSession: make potential time-consuming ops run on background thread" into gingerbread 2010-08-20 08:26:31 -07:00
Daniel Sandler
49b90c7bf7 am 3f677b1b: Merge "Fix periodically disappearing status icons." into gingerbread 
Merge commit '3f677b1b3e45240728de39d60441d791c0e8d3f8' into gingerbread-plus-aosp

* commit '3f677b1b3e45240728de39d60441d791c0e8d3f8':
  Fix periodically disappearing status icons.
 2010-08-20 06:03:41 -07:00
Daniel Sandler
ee0495467a Merge "Fix periodically disappearing status icons." into gingerbread 2010-08-20 06:01:20 -07:00
Chih-Chung Chang
d1232072eb am dc2eabd1: Merge "Don\'t recycle native bitmap after the finalizer is called." into gingerbread 
Merge commit 'dc2eabd10847d8e7f016fec5232d40b723ce2828' into gingerbread-plus-aosp

* commit 'dc2eabd10847d8e7f016fec5232d40b723ce2828':
  Don't recycle native bitmap after the finalizer is called.
 2010-08-20 03:56:33 -07:00
Chih-Chung Chang
7df3576df3 Merge "Don't recycle native bitmap after the finalizer is called." into gingerbread 2010-08-20 03:54:21 -07:00
Wu-cheng Li
33c0fc6d06 am 271c1bfd: Merge "Handle the camera open failure better." into gingerbread 
Merge commit '271c1bfd60eaa20c3f37e685864d992e0770ac00' into gingerbread-plus-aosp

* commit '271c1bfd60eaa20c3f37e685864d992e0770ac00':
  Handle the camera open failure better.
 2010-08-19 21:48:49 -07:00
Wu-cheng Li
34473e9156 Merge "Handle the camera open failure better." into gingerbread 2010-08-19 21:45:46 -07:00
Kenny Root
cd9ce313dd Free created FileMap when uncompressing files 
Change-Id: Ice22c4ecb7c129b74bf60cd66ae79e110b017a4a
 2010-08-19 18:39:58 -07:00
Jeff Brown
126872020b am 2f6d975b: Minor MotionEvent optimization. 
Merge commit '2f6d975b93bbc5b55c35a00d913ee38ad9b76401' into gingerbread-plus-aosp

* commit '2f6d975b93bbc5b55c35a00d913ee38ad9b76401':
  Minor MotionEvent optimization.
 2010-08-19 18:32:19 -07:00
Jake Hamby
b80103abd5 am 07936528: Merge "Cosmetic cleanups to SMSDispatcher classes." into gingerbread 
Merge commit '07936528cfbacb19d3f70b978708a52c47a31c0e' into gingerbread-plus-aosp

* commit '07936528cfbacb19d3f70b978708a52c47a31c0e':
  Cosmetic cleanups to SMSDispatcher classes.
 2010-08-19 18:16:55 -07:00
Jake Hamby
2da1ca0d0e Merge "Cosmetic cleanups to SMSDispatcher classes." into gingerbread 2010-08-19 18:14:18 -07:00
Chia-chi Yeh
93653ec6a3 am d3aaad0e: Merge "Use getMinFrameCount() instead of querying AudioSystem directly." into gingerbread 
Merge commit 'd3aaad0e2a30030db49ddc1a1cdd40011446938c' into gingerbread-plus-aosp

* commit 'd3aaad0e2a30030db49ddc1a1cdd40011446938c':
  Use getMinFrameCount() instead of querying AudioSystem directly.
 2010-08-19 18:10:27 -07:00
Chia-chi Yeh
8c8949ff9c Merge "Use getMinFrameCount() instead of querying AudioSystem directly." into gingerbread 2010-08-19 18:08:02 -07:00
James Dong
cc0d61aa9d am 0ea4ed3b: Don\'t drop a late frame which may lead to missing I frames in the MP4 file 
Merge commit '0ea4ed3bbb28fb6913392d2bee55621a1290dca8' into gingerbread-plus-aosp

* commit '0ea4ed3bbb28fb6913392d2bee55621a1290dca8':
  Don't drop a late frame which may lead to missing I frames in the MP4 file
 2010-08-19 18:07:08 -07:00
James Dong
ca07cc634f am 439fe407: Merge "Return error from MPEG4Writer stop() if the check on codec specific data failed" into gingerbread 
Merge commit '439fe407ff75b2c0fc21c66b430cd76e9f29ac90' into gingerbread-plus-aosp

* commit '439fe407ff75b2c0fc21c66b430cd76e9f29ac90':
  Return error from MPEG4Writer stop() if the check on codec specific data failed
 2010-08-19 18:04:47 -07:00
James Dong
8c3f6775ff Merge "Return error from MPEG4Writer stop() if the check on codec specific data failed" into gingerbread 2010-08-19 18:02:23 -07:00
Gilles Debunne
27fb44291b am d018a0ce: Merge "Text selection without trackball." into gingerbread 
Merge commit 'd018a0ce72124f668d859b19fe3e73f5637d3c7c' into gingerbread-plus-aosp

* commit 'd018a0ce72124f668d859b19fe3e73f5637d3c7c':
  Text selection without trackball.
 2010-08-19 18:01:20 -07:00
Gilles Debunne
a5be29f03f Merge "Text selection without trackball." into gingerbread 2010-08-19 17:59:08 -07:00
Scott Main
37e5891d80 am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo 
Merge commit '70c9ffbc838271f0ea27a4780eb146287de53ef6' into gingerbread-plus-aosp

* commit '70c9ffbc838271f0ea27a4780eb146287de53ef6':
  docs: add links from widget classes to tutorials
 2010-08-19 17:40:10 -07:00