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

18125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Leon Scroggins III
e95f395c15 am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo 
Merge commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b' into gingerbread-plus-aosp

* commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b':
  Add an option to hide the Voice Search icon.
 2010-09-14 10:26:44 -07:00
Leon Scroggins III
efe02e796b am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo 
Merge commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9' into gingerbread

* commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9':
  Add an option to hide the Voice Search icon.
 2010-09-14 10:23:35 -07:00
Leon Scroggins III
b0d30a12a0 Merge "Add an option to hide the Voice Search icon." into froyo 2010-09-14 10:21:25 -07:00
Hung-ying Tyan
fed3a15b28 am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread 
Merge commit '89a7180a242043a0b4d6695bf386c93365bf6797' into gingerbread-plus-aosp

* commit '89a7180a242043a0b4d6695bf386c93365bf6797':
  SipService: ignore connect event for non-active networks.
 2010-09-14 10:00:14 -07:00
Hung-ying Tyan
946dc2946e Merge "SipService: ignore connect event for non-active networks." into gingerbread 2010-09-14 09:57:47 -07:00
Dirk Dougherty
1ed654740c am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size. 
Merge commit 'e71396cf4704ee9e26f510b511c1e793d8048d83' into gingerbread-plus-aosp

* commit 'e71396cf4704ee9e26f510b511c1e793d8048d83':
  Doc change: update ADT 0.9.8 checksum and size.
 2010-09-14 09:46:44 -07:00
Kenny Root
1bf8fd86c2 am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread 
Merge commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2' into gingerbread-plus-aosp

* commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2':
  Dedupe timestamp in PackageSettings
 2010-09-14 09:46:40 -07:00
Hung-ying Tyan
18747f78c6 am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError() 
Merge commit '13f6270eb14b409709c936b828e2a2fd40e427c4' into gingerbread-plus-aosp

* commit '13f6270eb14b409709c936b828e2a2fd40e427c4':
  SipAudioCall: use SipErrorCode instead of string in onError()
 2010-09-14 09:44:03 -07:00
Hung-ying Tyan
77d35e00bc am 99bf4e45: SIP: remove dependency on javax.sip 
Merge commit '99bf4e45c4566172189735b34b368b76660ca57a' into gingerbread-plus-aosp

* commit '99bf4e45c4566172189735b34b368b76660ca57a':
  SIP: remove dependency on javax.sip
 2010-09-14 09:43:54 -07:00
Chung-yih Wang
55711d5b9c am 5dde95b8: Merge "Fix the bug of authentication in an outgoing call." into gingerbread 
Merge commit '5dde95b8fe0fea1a115a68f8acf826371da89da7' into gingerbread-plus-aosp

* commit '5dde95b8fe0fea1a115a68f8acf826371da89da7':
  Fix the bug of authentication in an outgoing call.
 2010-09-14 09:43:46 -07:00
Jaikumar Ganesh
16a1e21491 am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService. 
Merge commit 'a224f70b1efc29d9698da5b5c143251a43838f2b' into gingerbread-plus-aosp

* commit 'a224f70b1efc29d9698da5b5c143251a43838f2b':
  Fix interaction between BluetoothEventLoop and BluetoothService.
 2010-09-14 09:43:31 -07:00
Hung-ying Tyan
9e0d33cebd am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread 
Merge commit '4565933f03a99750a333e97e95408c404984510f' into gingerbread-plus-aosp

* commit '4565933f03a99750a333e97e95408c404984510f':
  SipService: deliver connectivity change to all sessions.
 2010-09-14 09:43:17 -07:00
Dirk Dougherty
473273b821 am 4b4af990: Doc change: update ADT 0.9.8 checksum and size. 
Merge commit '4b4af990af527c79073d546ead1850278caa7a8e' into gingerbread

* commit '4b4af990af527c79073d546ead1850278caa7a8e':
  Doc change: update ADT 0.9.8 checksum and size.
 2010-09-14 09:39:59 -07:00
Kenny Root
cc16981410 Merge "Dedupe timestamp in PackageSettings" into gingerbread 2010-09-14 09:29:48 -07:00
Chung-yih Wang
9ee8b4325f Merge "Fix the bug of authentication in an outgoing call." into gingerbread 2010-09-13 23:31:18 -07:00
Hung-ying Tyan
b408acba18 Merge "SipService: deliver connectivity change to all sessions." into gingerbread 2010-09-13 19:53:58 -07:00
Dianne Hackborn
47200f78a6 am 5251c800: Merge "Fix potential crash in sync." into gingerbread 
Merge commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d' into gingerbread-plus-aosp

* commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d':
  Fix potential crash in sync.
 2010-09-13 17:26:34 -07:00
Dianne Hackborn
ac306f576b Merge "Fix potential crash in sync." into gingerbread 2010-09-13 17:21:04 -07:00
Dianne Hackborn
6b6818ff62 am a0eb56ac: Merge "Work on issue #2991868: A toast pops up informing users..." into gingerbread 
Merge commit 'a0eb56ac59751ab7fb060980e14edcacca439635' into gingerbread-plus-aosp

* commit 'a0eb56ac59751ab7fb060980e14edcacca439635':
  Work on issue #2991868: A toast pops up informing users...
 2010-09-13 17:17:19 -07:00
Dianne Hackborn
fe460cc23a Merge "Work on issue #2991868: A toast pops up informing users..." into gingerbread 2010-09-13 17:14:00 -07:00
Adam Powell
c87304626d am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread 
Merge commit 'b07c078921fb917d33075a63d77fdf98221e2bac' into gingerbread-plus-aosp

* commit 'b07c078921fb917d33075a63d77fdf98221e2bac':
  DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
 2010-09-13 16:11:55 -07:00
Adam Powell
5828da75c4 Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread 2010-09-13 16:09:51 -07:00
Irfan Sheriff
cc5a76f9d6 am ab2ac887: Merge "Fix statusbar display of wifi signalstrength" into gingerbread 
Merge commit 'ab2ac887751c41ddb34daa97ea4da07b08cc2ba8' into gingerbread-plus-aosp

* commit 'ab2ac887751c41ddb34daa97ea4da07b08cc2ba8':
  Fix statusbar display of wifi signalstrength
 2010-09-13 16:08:12 -07:00
Irfan Sheriff
6eedaf78bb Merge "Fix statusbar display of wifi signalstrength" into gingerbread 2010-09-13 16:05:06 -07:00
Dianne Hackborn
772eff388c am 7e9f4eb2: Track client requests through location manager. 
Merge commit '7e9f4eb2608148436cef36c9969bf8a599b39e72' into gingerbread-plus-aosp

* commit '7e9f4eb2608148436cef36c9969bf8a599b39e72':
  Track client requests through location manager.
 2010-09-13 14:34:22 -07:00
Jaikumar Ganesh
350354e572 am cc5494c9: Out Of Band API for Secure Simple Pairing. 
Merge commit 'cc5494c9996f809e36539b24e8b6b67683383d29' into gingerbread-plus-aosp

* commit 'cc5494c9996f809e36539b24e8b6b67683383d29':
  Out Of Band API for Secure Simple Pairing.
 2010-09-13 11:52:19 -07:00
Shimeng (Simon) Wang
7be0c0b497 am fbd26467: Merge "DO NOT MERGE" into gingerbread 
Merge commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64' into gingerbread-plus-aosp

* commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64':
  DO NOT MERGE
 2010-09-13 11:51:55 -07:00
Eric Laurent
c2fad9102c am bd2e9ec6: Merge "Fix volume problems with insert revert" into gingerbread 
Merge commit 'bd2e9ec64d9a292a1309504c6c5fe33e1bc2333a' into gingerbread-plus-aosp

* commit 'bd2e9ec64d9a292a1309504c6c5fe33e1bc2333a':
  Fix volume problems with insert revert
 2010-09-13 11:51:46 -07:00
Shimeng (Simon) Wang
0e152daec3 Merge "DO NOT MERGE" into gingerbread 2010-09-13 11:00:16 -07:00
Eric Laurent
d17ae82cf5 Merge "Fix volume problems with insert revert" into gingerbread 2010-09-13 09:14:39 -07:00
Hung-ying Tyan
22bc063038 am 3d7606aa: SIP: enhance timeout and registration status feedback. 
Merge commit '3d7606aa607b24817e37c264f2141ed7b2d50be0' into gingerbread-plus-aosp

* commit '3d7606aa607b24817e37c264f2141ed7b2d50be0':
  SIP: enhance timeout and registration status feedback.
 2010-09-13 02:48:22 -07:00
Hung-ying Tyan
b1492e9c55 am 25b52a2f: SIP: remove dependency on javax.sip.SipException. 
Merge commit '25b52a2f97df112c2836972d0b6d9a4c7a9c4a4e' into gingerbread-plus-aosp

* commit '25b52a2f97df112c2836972d0b6d9a4c7a9c4a4e':
  SIP: remove dependency on javax.sip.SipException.
 2010-09-13 02:16:52 -07:00
Jeff Brown
230b09bca3 am c891d2b3: Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread 
Merge commit 'c891d2b3529b9cf24ef4781a585cd4784815e711' into gingerbread-plus-aosp

* commit 'c891d2b3529b9cf24ef4781a585cd4784815e711':
  Fix PointerLocationView when pointer ids are not zero-based.
 2010-09-12 20:47:50 -07:00
Jeff Brown
37163248ad Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread 2010-09-12 20:45:31 -07:00
Kenny Root
21c33f053c am 1bece432: Make nativeLibraryDir visible in the API 
Merge commit '1bece4320c1d2308b4a5b5aeda47b065312b3053' into gingerbread-plus-aosp

* commit '1bece4320c1d2308b4a5b5aeda47b065312b3053':
  Make nativeLibraryDir visible in the API
 2010-09-12 19:31:45 -07:00
Steve Howard
ff862dad9e am 90fb15a7: Support UI visibility and restarting in download manager. 
Merge commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0' into gingerbread-plus-aosp

* commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0':
  Support UI visibility and restarting in download manager.
 2010-09-12 19:11:08 -07:00
Jeff Brown
f6ecec5451 am 8abc9e9b: Merge "Don\'t play a sound if a volume key press is canceled." into gingerbread 
Merge commit '8abc9e9b9917760a63cc38a030e64f207aeef86d' into gingerbread-plus-aosp

* commit '8abc9e9b9917760a63cc38a030e64f207aeef86d':
  Don't play a sound if a volume key press is canceled.
 2010-09-12 18:13:47 -07:00
Jeff Brown
8346872699 am ff38e38d: Merge "Undo API patch due to field pulled up to superclass." into gingerbread 
Merge commit 'ff38e38d05a39584650c7c37b4b528334529ec0f' into gingerbread-plus-aosp

* commit 'ff38e38d05a39584650c7c37b4b528334529ec0f':
  Undo API patch due to field pulled up to superclass.
 2010-09-12 18:13:42 -07:00
Jeff Brown
77b34573ee Merge "Don't play a sound if a volume key press is canceled." into gingerbread 2010-09-12 18:11:42 -07:00