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

47286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
d9ca063d92 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
Ramesh Sudini
e62dee25e5 Do not merge: Telephony: Rename lte_on_cdma property. 
Fix Issue: 3479211. Dont use Mot property in Android Framework.

Change-Id: I1c13af5d00bf8c246ee6ecbedd1d1977a75c7142
 2011-03-14 13:44:30 -07:00
Ramesh Sudini
f57276154a Do not merge: Telephony: Corrections to LTE and eHRPD constant values. 
LTE and EHRPD values are not consistent with ril.h

Change-Id: I76d1ff408a37960873f537772637ff3ae3ac056f
 2011-03-14 13:44:30 -07:00
Wink Saville
f90c260904 Do not merge: Add outputting "on" or "off" setRadioPower. 
Change-Id: I0865f17e63f4b9867a8d33e7e147613010683a27
 2011-03-14 13:44:30 -07:00
Ramesh Sudini
c06c5c1a13 Do not merge: Telephony: Fix config to reflect the correct CM conn type. 
Reflect the correct connectivity manager connection type in the config.xml.

Change-Id: Ida4d0a6275addda6fe11878fa96dbac70283df91
 2011-03-14 13:44:30 -07:00
Wink Saville
124e28728b Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop. 
Change-Id: I131c8323737b0b5122a5087c77d8c6102d74b138
 2011-03-14 13:44:30 -07:00
Wink Saville
321b730a9d Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr. 
DataConnection now wraps its retry manager instead of exporting it.

Change-Id: Ibda6a235430b8ec51d1518c2956de71f964e3f39
 2011-03-14 13:44:30 -07:00
Gilles Debunne
467016e88a am 7069f7c0: (-s ours) am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp 
* commit '7069f7c0e78bf01bf83a5c14025525b8604f16b9':
  Double tap on a word no longer opens context menu. DO NOT MERGE
 2011-03-14 13:43:30 -07:00
Wink Saville
d6398ad3ce Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE 2011-03-14 13:43:05 -07:00
Wink Saville
d794596705 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
08d79acc46 Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE 2011-03-14 13:42:49 -07:00
Wink Saville
7fbae1d23c 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
16b7f051f7 Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE 2011-03-14 13:42:07 -07:00
Wink Saville
9e22c33c2b Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE 2011-03-14 13:41:42 -07:00
Wink Saville
c3853f3664 Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE 2011-03-14 13:41:26 -07:00
Gilles Debunne
7069f7c0e7 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
c15cf6353e 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
Michael Jurka
2b942d5329 Removing TextView predraw listeners sooner 
Solves issue where the listeners were being run on every frame
 2011-03-14 13:31:03 -07:00
Scott Main
abdf0d533c docs: update search dev guide with SearcView widget 
Change-Id: Ieb0ccdb78760a3c90df2381e647463f7532b0efc
 2011-03-14 13:27:53 -07:00
Huahui Wu
2d3ef37ae6 b/3392594 keep the remain touch points when one is ended. 
This is the Java side code change for b/3392594.
It adds an action index into the touch event data and pass it
to the native side.

Change-Id: Ibb393e62a590d0fff1dd3172041748e2b10501d6
 2011-03-14 13:21:23 -07:00
Gilles Debunne
816dd3d443 resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp 
Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da
 2011-03-14 12:57:01 -07:00
Sidipotu Ashok
14e974af73 libstagefright: Add error handling in AMRNB deooder 
Return error when AMRNB software decoder fails

Change-Id: I1203db4a4b5ac766c8c131d3d0ba18a4ff2e3ceb
 2011-03-14 12:48:52 -07:00
Wink Saville
9d7d5b4435 Do not merge: Fix 3G connectivity bug 3513741. 
ServiceStateTracker the registerForDataConnectionDetached needed to
test for !STATE_IN_SERVICE so that the other values for state also cause
the detached notifciation.

CdmaServiceStateTracker needed to use the ServiceStateTracker lists
and not the cdma specific lists for registration, which are now deleted.
Also removed an unused import.

CdmaLteServiceStateTracker cannot use the deleted cdma specific
registration lists.

Bug: 3513741
Change-Id: I0939a47251ffc70ea5c9e4675a4b4179d9c718b1
 2011-03-14 12:39:02 -07:00
Ramesh Sudini
df6542d5ca Do not merge: RIL: Merge Issue. LTE SIM additions. 
Change-Id: Ide70b523d376e1c3f2979051c083365346bf41f6
 2011-03-14 12:39:02 -07:00
Ramesh Sudini
074f83515f Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer. 
Bug: 3479209
Change-Id: I08b30c4868a12342221b6428eca8ffbb08f2b22a
 2011-03-14 12:39:01 -07:00
Ramesh Sudini
75acebd02d Do not merge: LTE: Fix SST for CDMALTEPhone. 
Change-Id: I4dc3d3bb4dba968694a5856624448b7ba1e35601
 2011-03-14 12:38:56 -07:00
Robert Greenwalt
88d852969a Do not merge: Clean up LTE code change 
Promoting RestrictedState so fewer callsites need be technology specific.
Promoting ServiceState change registration code.
bug:3487388

Change-Id: Iac3abca1a2943c1626553e1fd4bdd5baace86492
 2011-03-14 12:25:12 -07:00
Robert Greenwalt
04cac40ff8 Do not merge: Add some input checking to prevent problems 
Adding nulls can cause unhappiness.  It's suspected as a cause of 3495045.

bug:3495045
Change-Id: I925c965ef64032fc57849bf15fe9b11f4bc99351
 2011-03-14 12:25:09 -07:00
Wink Saville
9d7d62801d Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support" 
This reverts commit eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7
and is the first of the LTE commits in master being back ported
to the LTE branch.

Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
 2011-03-14 12:25:04 -07:00
Irfan Sheriff
fd10d5cf56 am fb897110: am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 
* commit 'fb8971106e5ea105e176c995c1ff3b4fbe630710':
  Backup and restore IP and proxy settings
 2011-03-14 12:10:27 -07:00
Kenny Root
6ffbe98553 am 76d41f57: am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 
* commit '76d41f5796c73e499f05375d004b39dc9961820c':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
 2011-03-14 12:09:54 -07:00
Gilles Debunne
3c03047bd4 am f2f3627f: am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 
* commit 'f2f3627f658931e9e8162cc6d066e4cccd81bd10':
  Paste popup uses a disabled icon when there is nothing to paste.
 2011-03-14 12:06:59 -07:00
Eric Laurent
eb30077ee9 am 733cb79a: am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 
* commit '733cb79a27fa434a1f5548201c953131285b4e81':
  Partial fix for issue 3515250: video chat and SCO
 2011-03-14 12:06:54 -07:00
James Dong
e625d9af42 am ad707d8f: (-s ours) am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 
* commit 'ad707d8f9aaff9cd1a121cb769772c921d870117':
  MP3Extractor and MP3 decoder fixes - DO NOT MERGE
 2011-03-14 12:05:48 -07:00
Ying Wang
e1068ede91 am 0bdf9f8c: am e5570255: am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread 
* commit '0bdf9f8c48be4b001de2bac65b655063ca0d58ec':
  Dist com.android.nfc_extras.jar.
 2011-03-14 12:05:44 -07:00
Robert Greenwalt
13e6c46b48 am 179dd46e: (-s ours) am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread 
* commit '179dd46e5de9dd61a9011708d262ca40012e9040':
  DO NOT MERGE Backport of I1f55df8a from master.
 2011-03-14 12:05:41 -07:00
Nick Pelly
d1c49d681c am a64e2ad4: resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp 
* commit 'a64e2ad4da3612586594a19489a2b5d44f3f23a0':
  Implement new NFC-EE API's as shared library (frameworks/base).
 2011-03-14 12:04:51 -07:00
Mike Lockwood
8ecd9dc04d am 2d24213f: am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 
* commit '2d24213fca55fece8ce4a69a53abcd45983b0443':
  MtpDevice: Handle zero length packets in readResponse()
 2011-03-14 12:04:27 -07:00
Gloria Wang
6325a0375b Merge "resolved conflicts for merge of c761a80d to master" 2011-03-14 12:02:58 -07:00
Gloria Wang
09ba5cebb2 resolved conflicts for merge of c761a80d to master 
Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
 2011-03-14 11:56:39 -07:00
Irfan Sheriff
fb8971106e 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
9b1ea0bd2c 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
76d41f5796 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
e21110f8b1 Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 2011-03-14 11:48:35 -07:00
James Dong
96a4323a47 Merge "Fix PV AAC decoder crash due to out-of-boundary array access." 2011-03-14 11:46:55 -07:00
Gilles Debunne
9c06c0ffc9 Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread 2011-03-14 11:30:17 -07:00
Jamie Gennis
6cd4656bf1 gl2_yuvtex: use the gralloc-provided stride. 
This change fixes the gl2_yuvtex test to use the stride chosen by the
gralloc implementation rather than hard-coding it.

Bug: 4081948
Change-Id: If7c96a20fc3fb1df2ff25e6afaa9f34dbad2002c
 2011-03-14 11:30:02 -07:00
Gilles Debunne
e1fb6ebd13 Merge "Removed empty block warnings in TextView" 2011-03-14 11:28:31 -07:00
Gilles Debunne
2b63ffc536 Merge "Wrong null check in TextView" 2011-03-14 11:28:20 -07:00
Gilles Debunne
f2f3627f65 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