drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,887 Commits 1 Branch 0 Tags
Commit Graph

48887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
4a28096dec am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE 
* commit '73ad388aae28213dd3f47bcac1b52c671e3cacc7':
  Check different CellLocation type in GsmDataConnectionTracker
 2011-04-08 13:23:24 -07:00
Wink Saville
73ad388aae Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE 2011-04-08 13:20:20 -07:00
Robert Greenwalt
01f8f290cd am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member. 
* commit '63edf6c4f5795009e55f2ae9556550c38daa9774':
  Rename PhoneBase's DataConnectionTracker member.
 2011-04-08 12:23:49 -07:00
Robert Greenwalt
63edf6c4f5 Rename PhoneBase's DataConnectionTracker member. 
Was called mDataConnection, but this is more confusing now that we have multiple
DataConnections.  Changed it to the more correct mDataConnectionTracker.

Change-Id: I3cdc4f2897d60e5b0885891744aa6ff2db27af37
 2011-04-08 11:54:01 -07:00
Kazuhiro Ondo
8968f9f6d4 Check different CellLocation type in GsmDataConnectionTracker 
Addressing phone app crash in GsmDataConnectionTracker when CDMALTEPhone
is used. CDMALTEPhone uses CDMA SST so getCellLocation() was returning
an instance of CdmaCellLocation. This was causing a crash when GsmDCT
type casts the instance as GsmCellLocation.

This patch tries to check the instance type before retrieving corresponding
cell id.

Change-Id: I6ac9cd4dc078552dc58d4d9350494a7b608c2b98
 2011-04-08 11:42:51 -07:00
Wink Saville
4b1a37d725 am 5203a5bc: Cleanup debugging. 
* commit '5203a5bc28a5ae432eab236780b2f97bdec71dbf':
  Cleanup debugging.
 2011-04-08 11:35:11 -07:00
Wink Saville
5203a5bc28 Cleanup debugging. 
Change-Id: I4c61b6716a6d03d70bc1e9013954d6b2002cec54
 2011-04-08 11:14:23 -07:00
Wink Saville
5008e92d1f am b9381109: am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE 
* commit 'b93811091d8e412d1247ee1f4506b7db1439235d':
  DataConnection: set CID to the correct value.
 2011-04-08 10:44:43 -07:00
Wink Saville
b93811091d am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE 
* commit '1905e166ed40ee11e80476848ef40e817512f740':
  DataConnection: set CID to the correct value.
 2011-04-08 10:41:09 -07:00
Wink Saville
1905e166ed Merge "DataConnection: set CID to the correct value." into honeycomb-LTE 2011-04-08 10:38:25 -07:00
Brian Carlstrom
ceb889711f Merge "Tolerate missing AccountManager resource, not just missing resource name" 2011-04-08 10:28:34 -07:00
Robert Greenwalt
c9fb9888ce am 2ce73e77: am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE 
* commit '2ce73e77c99effb9521db15c882529ccbafd57a6':
  Fix isApnTypeActive in GDCT.
 2011-04-08 10:11:43 -07:00
Robert Greenwalt
2ce73e77c9 am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE 
* commit '9c7f433c80fd2014562f8d161e6a34710fe475d6':
  Fix isApnTypeActive in GDCT.
 2011-04-08 10:09:03 -07:00
Elliott Hughes
fbb0788463 Merge "Use jniThrowException for exception throwing from native code." 2011-04-08 10:08:19 -07:00
Robert Greenwalt
9c7f433c80 Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE 2011-04-08 10:07:31 -07:00
Robert Greenwalt
2915875fb6 am e3e535a9: am 4410660e: Fix ISO country code of Slovenia. 
* commit 'e3e535a9c6b35971b54becc912e45da0f8b3f727':
  Fix ISO country code of Slovenia.
 2011-04-08 10:07:26 -07:00
Robert Greenwalt
37c75ae06b DataConnection: set CID to the correct value. 
import of partner change 5930

Change-Id: Iaa2d282f6f9292a57dfceedad676c9e3ad64f903
 2011-04-08 10:05:58 -07:00
Robert Greenwalt
e3e535a9c6 am 4410660e: Fix ISO country code of Slovenia. 
* commit '4410660e02c04b29d323c6d3bf81633fd07b6411':
  Fix ISO country code of Slovenia.
 2011-04-08 10:05:01 -07:00
Robert Greenwalt
4410660e02 Fix ISO country code of Slovenia. 
Misread an IBM site and thought it was sl-sl, but really it is sl-si.

fixes public bug 16021

Change-Id: I5b262a2b424fe2a0904f623f82449a539ede0fdb
 2011-04-08 09:53:55 -07:00
Robert Greenwalt
7a093b2c35 Fix isApnTypeActive in GDCT. 
The single active APN makes no sense now.  Add override function to
do the right thing.

Also makes ApnContext threadsafe.

Change-Id: I4302595e8818b7d31bdd32b5fdf4e3de1cd81ed8
 2011-04-08 09:39:57 -07:00
Teng-Hui Zhu
cfa5ccfbc5 Merge "Don't send pause again when coming back from full screen" 2011-04-08 09:19:01 -07:00
Wu-cheng Li
0d15042b39 Merge "Add camera focus area API." 2011-04-08 02:47:39 -07:00
Wu-cheng Li
30771b7733 Add camera focus area API. 
The API are still hidden.

bug:3475893

Change-Id: I92405c9e332b7fb141788cda7ebc9705dd666c67
 2011-04-08 17:45:15 +08:00
satok
b3fc1a5b8b Rename CorrectionSpan to SuggestionSpan 
Change-Id: I004b2e012b2de4de959a31da1f55b63ca7c14199
 2011-04-08 13:43:19 +09:00
Joe Onorato
43a17654cf Remove the deprecated things from Config.java. These haven't been working since before 1.0. 
Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
 2011-04-07 19:23:05 -07:00
Joe Onorato
ea4af8914a final 12.xml from gingerbread. 
Change-Id: I6089b57a22e7d9eaa43979ce8e9990192c83203d
 2011-04-07 19:23:03 -07:00
Elliott Hughes
8451b25a44 Use jniThrowException for exception throwing from native code. 
I'll do media and the generated gl stuff separately. Otherwise, this
cleans up all direct calls of ThrowNew/Throw except the one in the
binder that needs to remain.

Change-Id: I8f95a5f020f53b25926ad31ac0c9477ddf85d04b
 2011-04-07 19:17:57 -07:00
Dianne Hackborn
bdf7b013f8 Merge "Improve activity manager debug dumps." 2011-04-07 18:46:54 -07:00
Dianne Hackborn
e17aeb3103 Improve activity manager debug dumps. 
Activity manager now does all dump requests into apps
asynchronously, so it can nicely timeout if there is an
app problem.  Also lots of general cleanup of the am
dump output.

Change-Id: Id0dbccffb217315aeb85c964e379833e6aa3f5af
 2011-04-07 18:26:15 -07:00
Freeman Ng
96be4e01e6 Add prepaid data services URL to Secure Settings 
This is really a Gservices value being accessed through Secure Settings

bug: 4100048
Change-Id: I6e2eb72b17594b5c8f14a6ecfc21eafeff80fa1b
 2011-04-07 18:21:40 -07:00
Teng-Hui Zhu
22954d435d Don't send pause again when coming back from full screen 
When we enter full screen, the inline video has been paused.
When we re-play in the inline mode, we don't need to paused the previous video,
which is the full screen one.

bug:4259109
Change-Id: Ib951846e6c22893713b00699263f7d038bcb7353
 2011-04-07 17:53:24 -07:00
Nicolas Roard
280dda75f3 am 16d8de7a: am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1 
* commit '16d8de7a293e5d626823a59f2d8b74e0d4a75cbd':
  Remove uncalled function -- java counterpart of the fix for bug:4183801
 2011-04-07 17:27:53 -07:00
Nicolas Roard
16d8de7a29 am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1 
* commit '3e37a2f3ae3e3a777bf479a6562063922a7e44c6':
  Remove uncalled function -- java counterpart of the fix for bug:4183801
 2011-04-07 17:25:56 -07:00
Nicolas Roard
3e37a2f3ae am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1 
* commit 'fcba23536b1b432a5977e1ba4ea70ae0ff5aed4a':
  Remove uncalled function -- java counterpart of the fix for bug:4183801
 2011-04-07 17:24:05 -07:00
Nicolas Roard
fcba23536b Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1 2011-04-07 17:21:53 -07:00
Jason Simmons
293e03d868 In the MP3 extractor, compute timestamps based on sample count instead of byte count. 
This fixes timestamp accuracy on VBR streams.

Change-Id: I73a30309536919cbeb5e5163f2f1340e2b9fa4b1
 2011-04-07 17:16:04 -07:00
Adam Cohen
592cb584b0 Merge "Fix crash in bug 4259574" 2011-04-07 17:12:19 -07:00
Daisuke Miyakawa
52b952669d Merge "Add params for primary account to ContactsContract" 2011-04-07 17:03:18 -07:00
Wink Saville
5f2cff408d am 5f66c953: am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE 
* commit '5f66c953a7ebf5dd6dc2ce1c79f2c2ee324dd13b':
  Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.
 2011-04-07 16:53:34 -07:00
Wink Saville
5f66c953a7 am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE 
* commit '7183a7a584397142ab7347d6f721011d743fb699':
  Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.
 2011-04-07 16:51:50 -07:00
Wink Saville
7183a7a584 Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE 2011-04-07 16:49:02 -07:00
Adam Cohen
fa2e3ff3d3 Fix crash in bug 4259574 
Change-Id: I7fb3a4485ecfc2ac19eebdcfdcfe26e97a08e6b5
 2011-04-07 16:48:19 -07:00
Robert Greenwalt
e352d5f630 Merge "Fix build." 2011-04-07 16:01:46 -07:00
Robert Greenwalt
af6eddb1c2 Fix build. 
Change-Id: I9ac1c28de4f3f11f84b04923d4547ab64dd57f23
 2011-04-07 15:44:10 -07:00
Bill Gruber
05deb91a1e am 60bfa4d0: am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641 
* commit '60bfa4d0f5d55eb474146330be7f5404521b1c67':
  IAB docs--status codes fix Bug: 4208641
 2011-04-07 15:20:16 -07:00
Bill Gruber
60bfa4d0f5 am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641 
* commit '216d98949ddeb84359836594ab00be158d69545e':
  IAB docs--status codes fix Bug: 4208641
 2011-04-07 15:17:26 -07:00
Bill Gruber
216d98949d am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641 
* commit '6bb8b0ecb558373ba99e44ad5c351e1d7bb410d6':
  IAB docs--status codes fix Bug: 4208641
 2011-04-07 15:14:54 -07:00
Bill Gruber
6bb8b0ecb5 am afecd1e9: IAB docs--status codes fix Bug: 4208641 
* commit 'afecd1e99284dc386f07571c69edfed8c12f1cef':
  IAB docs--status codes fix Bug: 4208641
 2011-04-07 15:09:33 -07:00
Nicolas Roard
4bae836784 Remove uncalled function -- java counterpart of 
the fix for bug:4183801

Change-Id: Icaaa83743976be180ba570158bd4016e7f53c95a
 2011-04-07 15:04:26 -07:00
Wink Saville
1dd2ada5cf Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall. 
Added CommandsInterface.registerForRilConnected which allows components
to register for when the ril connects and provides the version of the
ril to the registrants or a -1 if the ril disconnects.

For ril version 6 RIL.setupDataCall needs to have RadioTechnology + 2
as the radioTechnology parameter when the rilVersion is >= 6.

DataConnection then uses registersForRilConnected to get the ril
version and provide the proper radioTechnology value to
RIL.setupDataCall

Change-Id: Iacba764b9e38a4a138d186ccf1625fea760cc56d
 2011-04-07 14:34:29 -07:00