ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,166 Commits 2 Branches 0 Tags 54 MiB
0c8ac6cabc
Commit Graph

18166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
0c8ac6cabc am 9f882c0b: Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread 
Merge commit '9f882c0b10ddbd436e24e51db8b1063bc5591d24' into gingerbread-plus-aosp

* commit '9f882c0b10ddbd436e24e51db8b1063bc5591d24':
  Fix audio input sample timestamp when audio driver loses audio samples
 2010-09-15 14:55:38 -07:00
James Dong
27c4c1f6b0 Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread 2010-09-15 14:51:49 -07:00
Hung-ying Tyan
6393deaf98 am 968735e5: Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread 
Merge commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3' into gingerbread-plus-aosp

* commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3':
  Fixing the NPE in SipPhone
 2010-09-15 13:06:30 -07:00
Hung-ying Tyan
8b419496df Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread 2010-09-15 13:02:46 -07:00
Hung-ying Tyan
01a692c039 am 698ddb0c: Merge "Fix links in SIP API javadoc." into gingerbread 
Merge commit '698ddb0cd64f7e317ae2f98de05d6462f22b2b2a' into gingerbread-plus-aosp

* commit '698ddb0cd64f7e317ae2f98de05d6462f22b2b2a':
  Fix links in SIP API javadoc.
 2010-09-15 12:59:04 -07:00
Hung-ying Tyan
c29530252a Merge "Fix links in SIP API javadoc." into gingerbread 2010-09-15 12:56:36 -07:00
Mathias Agopian
2233643036 am f182e8a8: fix a typo where the eventtags code were wrong 
Merge commit 'f182e8a8c2e726b376f3f4c0deb02dfdb6ae06a9' into gingerbread-plus-aosp

* commit 'f182e8a8c2e726b376f3f4c0deb02dfdb6ae06a9':
  fix a typo where the eventtags code were wrong
 2010-09-15 12:53:59 -07:00
Mathias Agopian
6a3de9a424 fix a typo where the eventtags code were wrong 
Change-Id: I517112a1475c10b71009a0aa9c3894c76a1f270f
 2010-09-15 12:46:59 -07:00
Andreas Huber
6fc8c0d737 am 9909b948: Merge "Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting." into gingerbread 
Merge commit '9909b948ac83d2cf19f7eeb06748b85fcac2212a' into gingerbread-plus-aosp

* commit '9909b948ac83d2cf19f7eeb06748b85fcac2212a':
  Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting.
 2010-09-15 11:28:18 -07:00
Andreas Huber
3b99f526d9 Merge "Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting." into gingerbread 2010-09-15 11:25:40 -07:00
David Brown
62eff51f5c am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread 
Merge commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed' into gingerbread-plus-aosp

* commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed':
  Mark MODIFY_PHONE_STATE permission as signatureOrSystem
 2010-09-15 11:15:14 -07:00
David Brown
47638c2d8e Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread 2010-09-15 11:11:18 -07:00
Hung-ying Tyan
ee37919e76 am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread 
Merge commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482' into gingerbread-plus-aosp

* commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482':
  SIP: add PEER_NOT_REACHABLE error feedback.
 2010-09-15 07:42:48 -07:00
Hung-ying Tyan
bf7ee96973 am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread 
Merge commit '096df8197b9133703d2ed0abb69813db0c8b4129' into gingerbread-plus-aosp

* commit '096df8197b9133703d2ed0abb69813db0c8b4129':
  SipService: send SERVER_ERROR if server doesn't provide nonce
 2010-09-15 07:42:38 -07:00
Hung-ying Tyan
cccd77aa5b Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread 2010-09-14 23:10:03 -07:00
Hung-ying Tyan
d8af3ea549 Merge "SipService: send SERVER_ERROR if server doesn't provide nonce" into gingerbread 2010-09-14 23:09:26 -07:00
Kenny Root
c3784ebfef am cee0b97e: Merge "Free AssetManager weak refs before unmounting" into gingerbread 
Merge commit 'cee0b97eed0a460e2da58500e24d3e4dac5cb9f6' into gingerbread-plus-aosp

* commit 'cee0b97eed0a460e2da58500e24d3e4dac5cb9f6':
  Free AssetManager weak refs before unmounting
 2010-09-14 18:04:53 -07:00
Kenny Root
5f47964493 Merge "Free AssetManager weak refs before unmounting" into gingerbread 2010-09-14 18:02:39 -07:00
Steve Howard
ecd0581146 am 536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread 
Merge commit '536ee090ef75add0f7244c1c22be83fe03a66010' into gingerbread-plus-aosp

* commit '536ee090ef75add0f7244c1c22be83fe03a66010':
  Fix name shadowing bug with revoking URI permissions.
 2010-09-14 17:48:30 -07:00
Steve Howard
7880a38a6e Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread 2010-09-14 17:46:22 -07:00
Chris Palmer
8fb81284c2 am 5bade703: Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread 
Merge commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5' into gingerbread-plus-aosp

* commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5':
  DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
 2010-09-14 17:45:59 -07:00
Chris Palmer
d843af292e Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread 2010-09-14 17:43:31 -07:00
John Wang
0cdb120b2a am 6457a28b: Merge "Complete event registration in CallManager." into gingerbread 
Merge commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5' into gingerbread-plus-aosp

* commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5':
  Complete event registration in CallManager.
 2010-09-14 16:28:10 -07:00
John Wang
cdf8f7064e Merge "Complete event registration in CallManager." into gingerbread 2010-09-14 16:26:14 -07:00
Erik
3af74f9874 am 426ee7f2: Fixes some bugs in TimeZoneUtils 
Merge commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487' into gingerbread-plus-aosp

* commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487':
  Fixes some bugs in TimeZoneUtils
 2010-09-14 16:19:03 -07:00
Jeff Brown
4f5d8bf9a1 am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread 
Merge commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73' into gingerbread-plus-aosp

* commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73':
  Replace epoll() with poll() and rename PollLoop to Looper.
 2010-09-14 15:32:03 -07:00
Jeff Brown
b06cca6228 Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread 2010-09-14 15:27:33 -07:00
Mathias Agopian
5e4cf02dfe am b3ffc78f: Merge "Add logging of various important graphics events" into gingerbread 
Merge commit 'b3ffc78f3432344702e6f5232067ab624083cad2' into gingerbread-plus-aosp

* commit 'b3ffc78f3432344702e6f5232067ab624083cad2':
  Add logging of various important graphics events
 2010-09-14 15:14:10 -07:00
Mathias Agopian
959d007a86 Merge "Add logging of various important graphics events" into gingerbread 2010-09-14 15:11:33 -07:00
jsh
72a1b25e88 am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread 
Merge commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4' into gingerbread-plus-aosp

* commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4':
  Unhide GsmCellLocation.getPsc().
 2010-09-14 15:05:53 -07:00
jsh
651a0519a9 Merge "Unhide GsmCellLocation.getPsc()." into gingerbread 2010-09-14 15:02:46 -07:00
Eric Laurent
a5dd331043 am eea35ce8: Merge "Added intents for audio effects control application" into gingerbread 
Merge commit 'eea35ce87f179098215b590fbb21162cca5ff8da' into gingerbread-plus-aosp

* commit 'eea35ce87f179098215b590fbb21162cca5ff8da':
  Added intents for audio effects control application
 2010-09-14 13:05:22 -07:00
Eric Laurent
7568b361cf Merge "Added intents for audio effects control application" into gingerbread 2010-09-14 13:02:18 -07:00
Dianne Hackborn
c368573cd1 am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread 
Merge commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b' into gingerbread-plus-aosp

* commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b':
  Fix problem where power manager was calling battery stats with bad wl type.
 2010-09-14 12:31:07 -07:00
Dianne Hackborn
71acc203ed Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread 2010-09-14 12:28:08 -07:00
Erik
b51030fbf0 am b92788aa: Merge "Adds time zone functionality into fw as a hidden api" into gingerbread 
Merge commit 'b92788aa040d0971b4e54589aef7675f34d96e5d' into gingerbread-plus-aosp

* commit 'b92788aa040d0971b4e54589aef7675f34d96e5d':
  Adds time zone functionality into fw as a hidden api
 2010-09-14 12:25:31 -07:00
Erik
336da25dda Merge "Adds time zone functionality into fw as a hidden api" into gingerbread 2010-09-14 12:21:53 -07:00
Dianne Hackborn
991abcb98a am 934516e1: Merge "Fix issue #2999795: Runtime restart on Crespo" into gingerbread 
Merge commit '934516e10150874fd1db5ab9e0be3ae793441fd8' into gingerbread-plus-aosp

* commit '934516e10150874fd1db5ab9e0be3ae793441fd8':
  Fix issue #2999795: Runtime restart on Crespo
 2010-09-14 11:54:28 -07:00
Dianne Hackborn
a667ca867a Merge "Fix issue #2999795: Runtime restart on Crespo" into gingerbread 2010-09-14 11:50:51 -07:00
Brad Fitzpatrick
08df773b12 am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread 
Merge commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf' into gingerbread-plus-aosp

* commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf':
  Unify some duplicate StrictMode-enabling code.
 2010-09-14 11:39:54 -07:00
Brad Fitzpatrick
553270cc55 am fb85bc66: Merge "Add missing wallpaper service lock." into gingerbread 
Merge commit 'fb85bc66c467be96fe8420338321df6f15359d7d' into gingerbread-plus-aosp

* commit 'fb85bc66c467be96fe8420338321df6f15359d7d':
  Add missing wallpaper service lock.
 2010-09-14 11:39:43 -07:00
Brad Fitzpatrick
52b649f02a Merge "Unify some duplicate StrictMode-enabling code." into gingerbread 2010-09-14 11:37:13 -07:00
Brad Fitzpatrick
e10c4c56e7 Merge "Add missing wallpaper service lock." into gingerbread 2010-09-14 11:37:05 -07:00
Romain Guy
60e96a56b4 am 52e19d59: Merge "Change the keep alive time for excess idle threads." into gingerbread 
Merge commit '52e19d5917b8f057131c1dc8b3eb772febd791d9' into gingerbread-plus-aosp

* commit '52e19d5917b8f057131c1dc8b3eb772febd791d9':
  Change the keep alive time for excess idle threads.
 2010-09-14 11:36:55 -07:00
Romain Guy
8f8715a1e3 Merge "Change the keep alive time for excess idle threads." into gingerbread 2010-09-14 11:34:01 -07:00
Brian Carlstrom
fe9f855c4e am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters 
Merge commit '405d4db50b3db1fc5e015475218e190d193332d4' into gingerbread-plus-aosp

* commit '405d4db50b3db1fc5e015475218e190d193332d4':
  Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
 2010-09-14 11:29:57 -07:00
Brian Carlstrom
4128f7c02b am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread 
Merge commit '94126238427f04ecb86fe6832113afb2f04e89b5' into gingerbread-plus-aosp

* commit '94126238427f04ecb86fe6832113afb2f04e89b5':
  Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
 2010-09-14 11:17:22 -07:00
Brian Carlstrom
e565df9d96 Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread 2010-09-14 11:15:01 -07:00
John Wang
5b86c15a4b am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread 
Merge commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6' into gingerbread-plus-aosp

* commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6':
  Return immutable copies of private callList.
 2010-09-14 10:31:45 -07:00
John Wang
db608bd7d0 Merge "Return immutable copies of private callList." into gingerbread 2010-09-14 10:28:33 -07:00