ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
31,487 Commits 2 Branches 0 Tags 54 MiB
b8847d1bbb
Commit Graph

31487 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Huahui Wu
b8847d1bbb Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-14 14:46:26 -07:00
Scott Main
3758c1b419 am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget 
* commit '462012db70fb73431bb25909d73e45fea9fc5911':
  docs: update search dev guide with SearcView widget
 2011-03-14 14:42:51 -07:00
Eric Fischer
605afd89e3 Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-14 14:42:50 -07:00
Scott Main
529031662f am abdf0d53: docs: update search dev guide with SearcView widget 
* commit 'abdf0d533c292709e51cee2c1213d5e44baca963':
  docs: update search dev guide with SearcView widget
 2011-03-14 14:36:56 -07:00
Eric Fischer
7175cacc8c am 175121a5: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '175121a513f4cea91d7950d6b3978383d3b2a352':
  Import revised translations.  DO NOT MERGE
 2011-03-14 14:29:05 -07:00
Eric Fischer
8cf7363ba7 am 9f70f526: Merge "Add "new incognito window" translations." into honeycomb-mr1 
* commit '9f70f5268fac9c2dd5ed4cb9582da5931c846a91':
  Add "new incognito window" translations.
 2011-03-14 14:28:58 -07:00
Eric Fischer
b066ddc849 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-14 14:17:01 -07:00
Eric Fischer
230de7bfc0 Merge "Add "new incognito window" translations." into honeycomb-mr1 2011-03-14 14:13:29 -07:00
Ramesh Sudini
acd5de1b85 am e62dee25: Do not merge: Telephony: Rename lte_on_cdma property. 
* commit 'e62dee25e50c04c235cd37df66e4ef123b761663':
  Do not merge: Telephony: Rename lte_on_cdma property.
 2011-03-14 13:49:36 -07:00
Ramesh Sudini
fe974fc806 am f5727615: Do not merge: Telephony: Corrections to LTE and eHRPD constant values. 
* commit 'f57276154aaa587524374db8e0d7228383611bf3':
  Do not merge: Telephony: Corrections to LTE and eHRPD constant values.
 2011-03-14 13:47:48 -07:00
Wink Saville
95315a5c8a am f90c2609: Do not merge: Add outputting "on" or "off" setRadioPower. 
* commit 'f90c26090402a517aa68cade7f452bc1ad85e654':
  Do not merge: Add outputting "on" or "off" setRadioPower.
 2011-03-14 13:47:44 -07:00
Ramesh Sudini
0eca33c915 am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type. 
* commit 'c06c5c1a13da26c8435f2d4b72a41a38e1d463b8':
  Do not merge: Telephony: Fix config to reflect the correct CM conn type.
 2011-03-14 13:47:42 -07:00
Wink Saville
732e0d2e17 am 124e2872: Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop. 
* commit '124e28728b16cb63c700a323b9dfb1348580c896':
  Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop.
 2011-03-14 13:47:39 -07:00
Wink Saville
654e381e67 am 321b730a: Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr. 
* commit '321b730a9d34b237c26075d963c8febf8d62eff1':
  Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr.
 2011-03-14 13:47:36 -07:00
Wink Saville
adf53bf027 am d6398ad3: Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE 
* commit 'd6398ad3ce962a6345d18b166ae8484a4259f6f2':
  Do not merge: Fix 3G connectivity bug 3513741.
 2011-03-14 13:44:50 -07:00
Wink Saville
9460cac2ff am 08d79acc: Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE 
* commit '08d79acc462a395a6fb6d0b126eb4d97466962c7':
  Do not merge: RIL: Merge Issue. LTE SIM additions.
 2011-03-14 13:44:48 -07:00
Wink Saville
8ce508231f am 7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE 
* commit '7fbae1d23c99383d0dbaa1be35a41246934e3ce4':
  Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.
 2011-03-14 13:44:45 -07:00
Wink Saville
536c9e41b1 am 16b7f051: Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE 
* commit '16b7f051f71e276f4dd45455e92c33a0894bab10':
  Do not merge: LTE: Fix SST for CDMALTEPhone.
 2011-03-14 13:44:43 -07:00
Wink Saville
ea1b0c6b66 am 9e22c33c: Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE 
* commit '9e22c33c2b6ff5c9a45ebac88d048f6f61557e82':
  Do not merge: Clean up LTE code change
 2011-03-14 13:44:40 -07:00
Wink Saville
4deedeb0e7 am c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE 
* commit 'c3853f36645f2f4f4801d6465e82095cf38ea043':
  Do not merge: Add some input checking to prevent problems
 2011-03-14 13:44:37 -07:00
Wink Saville
846d2b4f27 Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE 2011-03-14 13:43:05 -07:00
Wink Saville
35f9c49542 am c15cf635: Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE 
* commit 'c15cf6353ee1c1cae83039a19fb8d5e5c7d76804':
  Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
 2011-03-14 13:42:50 -07:00
Wink Saville
456b90a3a6 Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE 2011-03-14 13:42:49 -07:00
Wink Saville
fc2aa886fe Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE 2011-03-14 13:42:24 -07:00
Wink Saville
1ad816a48f Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE 2011-03-14 13:42:07 -07:00
Wink Saville
b979cc999b Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE 2011-03-14 13:41:42 -07:00
Wink Saville
34840b1c6e Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE 2011-03-14 13:41:26 -07:00
Gilles Debunne
b66cc3d5fc am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp 
* commit '816dd3d443108b473965f97123eef7300f53615f':
  Double tap on a word no longer opens context menu. DO NOT MERGE
 2011-03-14 13:41:14 -07:00
Wink Saville
32abb2088b Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE 2011-03-14 13:40:58 -07:00
Gilles Debunne
4feb59c624 resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp 
Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da
 2011-03-14 12:57:01 -07:00
Irfan Sheriff
00ff0ca922 am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 
* commit '9b1ea0bd2c9af64c424fa4fef327108cb376b74f':
  Backup and restore IP and proxy settings
 2011-03-14 11:56:03 -07:00
Irfan Sheriff
2de4863141 am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 
* commit 'e21110f8b1e4aa884f7a4e2164ae90dab8d5f3fa':
  Backup and restore IP and proxy settings
 2011-03-14 11:50:38 -07:00
Kenny Root
ea6193c275 am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 
* commit '206c62ed34dc8a48fd6c907d95456226949f42dd':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
 2011-03-14 11:49:56 -07:00
Irfan Sheriff
bd9100b11b Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 2011-03-14 11:48:35 -07:00
Gilles Debunne
d567127f0a Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread 2011-03-14 11:30:17 -07:00
Gilles Debunne
5a45a3e528 am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 
* commit '8503af848657356411a9bb4cf15d798d4f15111b':
  Paste popup uses a disabled icon when there is nothing to paste.
 2011-03-14 11:27:54 -07:00
Gilles Debunne
4e29229f65 Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 2011-03-14 11:26:36 -07:00
Eric Laurent
2652f094f7 am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 
* commit '3cbfd10bbb869f763880060ebe01dd66da62bbc3':
  Partial fix for issue 3515250: video chat and SCO
 2011-03-14 11:23:56 -07:00
Eric Laurent
ee76b4c19d Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 2011-03-14 11:21:50 -07:00
James Dong
7964f5ba8c am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 
* commit '7d93b7574f741a9cd8872771faefa3c92bed6576':
  MP3Extractor and MP3 decoder fixes - DO NOT MERGE
 2011-03-14 10:53:51 -07:00
Ying Wang
6e53d8e334 am e5570255: am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread 
* commit 'e5570255636b60ae2eb56d2f7adf270a8cc40843':
  Dist com.android.nfc_extras.jar.
 2011-03-14 10:53:44 -07:00
Robert Greenwalt
928595e7f0 am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread 
* commit '2e7415564ad1d77537f9f3d5151ed480fcfc6ef9':
  DO NOT MERGE Backport of I1f55df8a from master.
 2011-03-14 10:53:38 -07:00
Nick Pelly
096b928fb8 resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp 
Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42
 2011-03-14 10:28:11 -07:00
Mike Lockwood
33dff53e30 am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 
* commit '3ec9d06f070db3a8899ad235736abd0ffaf6f578':
  MtpDevice: Handle zero length packets in readResponse()
 2011-03-14 09:44:15 -07:00
Mike Lockwood
bd7c76eb79 Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 2011-03-14 09:43:14 -07:00
Gloria Wang
dc87971f72 am 7ea3c7f5: Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waitin 
* commit '7ea3c7f5a31dcc40d3b5042e3eb724916b66384e':
  - Some change on the DrmManager in order to support feature request 4082089.     In DrmManager, we currently lock both processDrmInfo() and onInfo() which is     ok for now since processDrmInfo() is async call, and it will return without     waiting for onInfo() call. However, if we send an event in processDrmInfo(),     we will got deadlock here because we need to invoke onInf() which will wait     for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock.
 2011-03-14 09:35:08 -07:00
Gloria Wang
50e4bf4895 Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1 2011-03-14 09:32:58 -07:00
Mike Lockwood
817b0a5efd am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 
* commit 'e976ff4a2203e5a01c9a1c1a018ba9e5ab7777f7':
  Add a dialog to ask user to start an application for a USB device or accessory
 2011-03-14 06:55:24 -07:00
Mike Lockwood
52cf8ff162 am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 
* commit 'dec0b755fff1bf87aafd397ef0dd864f54c587cf':
  MTP host: Fix problems reading large data packets
 2011-03-14 06:55:21 -07:00
Mike Lockwood
6f1547b9a4 Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 2011-03-14 04:02:50 -07:00