ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity
19,310 Commits 2 Branches 0 Tags 54 MiB
24925bfba2
Commit Graph

19310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
8264321e31 am 80328ba0: am 8ea71511: Merge "Initial tool for OBB manipulation" into gingerbread 
Merge commit '80328ba09606bd0825d7d4c9a4f213d1de09e53a'

* commit '80328ba09606bd0825d7d4c9a4f213d1de09e53a':
  Initial tool for OBB manipulation
 2010-08-11 14:15:20 -07:00
Kenny Root
cd8fce00b1 am f5ee5358: am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread 
Merge commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798'

* commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798':
  Move OBB file reading to DefaultContainerService
 2010-08-11 14:15:10 -07:00
Kenny Root
e827d9f4ac am 8ea71511: Merge "Initial tool for OBB manipulation" into gingerbread 
Merge commit '8ea71511c64e61fe23004889ff7032f991a751c8' into gingerbread-plus-aosp

* commit '8ea71511c64e61fe23004889ff7032f991a751c8':
  Initial tool for OBB manipulation
 2010-08-11 14:10:26 -07:00
Kenny Root
bdc73b24e9 am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread 
Merge commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e' into gingerbread-plus-aosp

* commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e':
  Move OBB file reading to DefaultContainerService
 2010-08-11 14:10:18 -07:00
Kenny Root
b6acda2f80 Merge "Initial tool for OBB manipulation" into gingerbread 2010-08-11 14:06:51 -07:00
Kenny Root
cc440b377b Merge "Move OBB file reading to DefaultContainerService" into gingerbread 2010-08-11 14:06:39 -07:00
Andreas Huber
2212b0198c am 136d8336: am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread 
Merge commit '136d8336b6cb18067cd783185dacef34ae785519'

* commit '136d8336b6cb18067cd783185dacef34ae785519':
  This code in CameraSource really should hold the lock.
 2010-08-11 13:32:36 -07:00
Andreas Huber
a97323a1fb am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread 
Merge commit '90d1d104272954042d5440f248980e4348e97686' into gingerbread-plus-aosp

* commit '90d1d104272954042d5440f248980e4348e97686':
  This code in CameraSource really should hold the lock.
 2010-08-11 13:28:51 -07:00
Andreas Huber
58f81d841b Merge "This code in CameraSource really should hold the lock." into gingerbread 2010-08-11 13:20:59 -07:00
Vairavan Srinivasan
adae074200 am 79cb9a5d: am f2e67a57: InputMethodService: Fix ignore case in showInputMethodPickerFromClient 
Merge commit '79cb9a5d2d455af22c56b8cee045962c61668422'

* commit '79cb9a5d2d455af22c56b8cee045962c61668422':
  InputMethodService: Fix ignore case in showInputMethodPickerFromClient
 2010-08-11 12:39:24 -07:00
Jean-Baptiste Queru
118115c495 am 1ca94798: Fix build: HistoryRecord is now ActivityRecord 
Merge commit '1ca94798ccd3a9b20f7824231cfb1f5fdf6bc719'

* commit '1ca94798ccd3a9b20f7824231cfb1f5fdf6bc719':
  Fix build: HistoryRecord is now ActivityRecord
 2010-08-11 12:35:55 -07:00
Jean-Baptiste Queru
954d2d5fae am 44e43d1f: resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp 
Merge commit '44e43d1f6593ae912b3818692058196233cd4ac9'

* commit '44e43d1f6593ae912b3818692058196233cd4ac9':
  InputMethodManagerService: Fix acore crash on boot up
 2010-08-11 12:35:30 -07:00
Vairavan Srinivasan
9ff1dfae54 am f2e67a57: InputMethodService: Fix ignore case in showInputMethodPickerFromClient 
Merge commit 'f2e67a5779d404b4791c6ab5b0d30dfb2c463514' into gingerbread-plus-aosp

* commit 'f2e67a5779d404b4791c6ab5b0d30dfb2c463514':
  InputMethodService: Fix ignore case in showInputMethodPickerFromClient
 2010-08-11 12:07:56 -07:00
Jean-Baptiste Queru
42b42be2cd resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp 
Change-Id: Id6bd5ab1d6eda0372f2fd8eecb8f1d204066c4d5
 2010-08-11 11:51:31 -07:00
Kenny Root
1dfd9f8a97 Initial tool for OBB manipulation 
Add "obbtool" host command for adding, removing, and querying Opaque
Binary Blob (OBB) information from a file.

Change-Id: Id2ac41e687ad2a500c362616d6738a8ae7e8f5c3
 2010-08-11 11:24:41 -07:00
Jean-Baptiste Queru
76ea956dff am a6c28cb0: am 2ffe74de: Merge "Fix isUsbMassStorageConnected() will always return true" 
Merge commit 'a6c28cb014c32b9522c41385075c9db77296f6e7'

* commit 'a6c28cb014c32b9522c41385075c9db77296f6e7':
  Fix isUsbMassStorageConnected() will always return true
 2010-08-11 10:44:06 -07:00
Jean-Baptiste Queru
41499c01eb am 2ffe74de: Merge "Fix isUsbMassStorageConnected() will always return true" 
Merge commit '2ffe74ded51ee73ae1b412861f5d6ec58c835390' into gingerbread-plus-aosp

* commit '2ffe74ded51ee73ae1b412861f5d6ec58c835390':
  Fix isUsbMassStorageConnected() will always return true
 2010-08-11 10:40:39 -07:00
Alex Sakhartchouk
6608ab0fde Merge "Adding allocation reference counting to the a3d models." 2010-08-11 10:33:33 -07:00
Jean-Baptiste Queru
3476cbb432 Merge "Fix isUsbMassStorageConnected() will always return true" 2010-08-11 10:27:17 -07:00
Jean-Baptiste Queru
7e9ba2dc3c am a59aaed8: am bc881e66: Merge "frameworks/base: Swap width and height of temporary buffer only with orientation change" 
Merge commit 'a59aaed81b47f59ee9ee724760c4c39fcf429a18'

* commit 'a59aaed81b47f59ee9ee724760c4c39fcf429a18':
  frameworks/base: Swap width and height of temporary buffer only with
 2010-08-11 10:20:15 -07:00
Jean-Baptiste Queru
4952ac0498 am bc881e66: Merge "frameworks/base: Swap width and height of temporary buffer only with orientation change" 
Merge commit 'bc881e66d15181494fdd5d0ece83e20ef325453b' into gingerbread-plus-aosp

* commit 'bc881e66d15181494fdd5d0ece83e20ef325453b':
  frameworks/base: Swap width and height of temporary buffer only with
 2010-08-11 10:16:32 -07:00
Jean-Baptiste Queru
b203a27f0e Merge "frameworks/base: Swap width and height of temporary buffer only with orientation change" 2010-08-11 10:11:14 -07:00
Jean-Baptiste Queru
8f4970e3e4 am f781b4ef: am e37ab632: Merge "Fix build on some linux machines" 
Merge commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3'

* commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3':
  Fix build on some linux machines
 2010-08-11 10:07:56 -07:00
Alex Sakhartchouk
b924cd07bd Merge "Renaming stucts back." 2010-08-11 10:05:38 -07:00
Jean-Baptiste Queru
52f34da50e am e37ab632: Merge "Fix build on some linux machines" 
Merge commit 'e37ab63221af94d69437741a3645fc0e14a680bc' into gingerbread-plus-aosp

* commit 'e37ab63221af94d69437741a3645fc0e14a680bc':
  Fix build on some linux machines
 2010-08-11 10:04:31 -07:00
Naveen Kalla
592e16cb97 am 371dbcba: am c4c4c98c: In CW Interrogation service class is not sent. 
Merge commit '371dbcba11070ed2fdd58a4c328b5d7b9ad65a40'

* commit '371dbcba11070ed2fdd58a4c328b5d7b9ad65a40':
  In CW Interrogation service class is not sent.
 2010-08-11 09:56:05 -07:00
Jean-Baptiste Queru
cc15993db3 Merge "Fix build on some linux machines" 2010-08-11 09:55:36 -07:00
Naveen Kalla
c6261527d8 am c4c4c98c: In CW Interrogation service class is not sent. 
Merge commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559' into gingerbread-plus-aosp

* commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559':
  In CW Interrogation service class is not sent.
 2010-08-11 09:53:01 -07:00
Jean-Baptiste Queru
240199e9fd am 92798a48: am 076d0654: Merge "SIM toolkit enhancements and bug fixes" 
Merge commit '92798a481cbd928711339606bc1d9e81fa80f7b2'

* commit '92798a481cbd928711339606bc1d9e81fa80f7b2':
  SIM toolkit enhancements and bug fixes
 2010-08-11 09:52:34 -07:00
Jean-Baptiste Queru
fa7d2f13fa am 076d0654: Merge "SIM toolkit enhancements and bug fixes" 
Merge commit '076d06547f90c480a4ed19da6f4b3d1270f57ec9' into gingerbread-plus-aosp

* commit '076d06547f90c480a4ed19da6f4b3d1270f57ec9':
  SIM toolkit enhancements and bug fixes
 2010-08-11 09:44:27 -07:00
Jean-Baptiste Queru
f6cfc97c64 Merge "SIM toolkit enhancements and bug fixes" 2010-08-11 09:29:03 -07:00
Alex Sakhartchouk
240ddab063 Merge "Adding quaternion functions to math library." 2010-08-11 09:02:51 -07:00
Daniel Sandler
be76716f82 Merge "Apparently people want to know what time it is." 2010-08-11 08:47:44 -07:00
Irfan Sheriff
5cec1782e2 Merge "Split WifiStateMachine from WifiStateTracker" 2010-08-11 07:53:51 -07:00
Patrick Scott
b6dac04d34 am dc1f0858: am 9902196f: Fix npe in getCacheTotalSize. 
Merge commit 'dc1f08586eadc3a3dbbdf22b520ba1065b2032f8'

* commit 'dc1f08586eadc3a3dbbdf22b520ba1065b2032f8':
  Fix npe in getCacheTotalSize.
 2010-08-11 07:21:25 -07:00
Patrick Scott
382f01dcc0 am 9902196f: Fix npe in getCacheTotalSize. 
Merge commit '9902196f9885d369e37cf44084e3f04513511ab0' into gingerbread-plus-aosp

* commit '9902196f9885d369e37cf44084e3f04513511ab0':
  Fix npe in getCacheTotalSize.
 2010-08-11 07:18:27 -07:00
Maksymilian Osowski
699e576310 Merge "Added a basic version of python script and supporting code in DumpRenderTree." 2010-08-11 05:26:38 -07:00
Maksymilian Osowski
3256429351 Merge "Resets Summarizer after everything's finished." 2010-08-11 04:02:21 -07:00
Hung-ying Tyan
cb9ab6ccca am 03381faf: (-s ours) am 1777a274: SIP: remove unused file. 
Merge commit '03381faf3492cd1360b3d239c6f23a801c9d4b7f'

* commit '03381faf3492cd1360b3d239c6f23a801c9d4b7f':
  SIP: remove unused file.
 2010-08-11 03:09:42 -07:00
Hung-ying Tyan
68aab76303 am 1777a274: SIP: remove unused file. 
Merge commit '1777a2748bfa25dfd9d081d71504572b9a7256b1' into gingerbread-plus-aosp

* commit '1777a2748bfa25dfd9d081d71504572b9a7256b1':
  SIP: remove unused file.
 2010-08-11 01:56:56 -07:00
Dianne Hackborn
f09b0ae832 am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread 
Merge commit '679ac09a5c22175354f3a04b28456b323839530e'

* commit '679ac09a5c22175354f3a04b28456b323839530e':
  More native work.
 2010-08-11 00:50:56 -07:00
Dianne Hackborn
87566dc8a0 am a5ae50cd: Merge "More native work." into gingerbread 
Merge commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb' into gingerbread-plus-aosp

* commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb':
  More native work.
 2010-08-11 00:47:51 -07:00
Dianne Hackborn
76263ffc88 Merge "More native work." into gingerbread 2010-08-11 00:45:44 -07:00
Dianne Hackborn
c3ef3ae552 More native work. 
Implement save/restore of state, and add native APIs for
configuration information.

Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
 2010-08-11 00:29:59 -07:00
Chung-yih Wang
89784a3145 am 0a6db9be: am 2725a655: Fix a bug in unregisterPhone(). 
Merge commit '0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a'

* commit '0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a':
  Fix a bug in unregisterPhone().
 2010-08-10 23:44:52 -07:00
Chung-yih Wang
5ece7c1739 am 2725a655: Fix a bug in unregisterPhone(). 
Merge commit '2725a6551261044318e42ccc9ebeabed7edf5ee7' into gingerbread-plus-aosp

* commit '2725a6551261044318e42ccc9ebeabed7edf5ee7':
  Fix a bug in unregisterPhone().
 2010-08-10 23:41:48 -07:00
Romain Guy
bba714db69 Merge "Support non-PorterDuff xfermodes with Xfermode." 2010-08-10 21:56:12 -07:00
Hung-ying Tyan
880d71a003 am 9a025349: am 091c5238: Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread 
Merge commit '9a025349dc5a4e699fbe99a714f523e9903fa534'

* commit '9a025349dc5a4e699fbe99a714f523e9903fa534':
  SipAudioCall: perform local ops before network op in endCall()
 2010-08-10 21:54:07 -07:00
Chung-yih Wang
11d4c629b3 am 2c9de2b9: am f57324cf: Add getSipUri() for identification. 
Merge commit '2c9de2b9e5568c8918b36866d3cf20833a8c20e1'

* commit '2c9de2b9e5568c8918b36866d3cf20833a8c20e1':
  Add getSipUri() for identification.
 2010-08-10 21:54:01 -07:00
Yu Shan Emily Lau
2d1fef34b5 am 1ded9f95: am fbb936bf: Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread 
Merge commit '1ded9f95636a83298658bfcd840ae8e51127c714'

* commit '1ded9f95636a83298658bfcd840ae8e51127c714':
  Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
 2010-08-10 21:53:54 -07:00