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

13074 Commits

Author SHA1 Message Date
Brad Fitzpatrick
403da3a79a am 8d25eab1: Merge "Releasing lock even if exception is thrown." 
* commit '8d25eab10523ac2424dc645dc697126dbadad588':
  Releasing lock even if exception is thrown.
 2011-03-15 11:37:37 -07:00
Brad Fitzpatrick
b01fc9fb45 am 8b5345fb: Merge "Fixing self-assignment in copying code." 
* commit '8b5345fb3647fee0ec5882537b6a68bb90f4ac1b':
  Fixing self-assignment in copying code.
 2011-03-15 11:37:25 -07:00
Brad Fitzpatrick
ceae99835e am 9a01a2f2: Merge "Fixing self-assignment in cloning code." 
* commit '9a01a2f2720632aa9cc230a4ebb0ed7aee762eec':
  Fixing self-assignment in cloning code.
 2011-03-15 11:33:40 -07:00
Brad Fitzpatrick
33dd1bae6e am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long." 
* commit '29d75c9a10a1ff6d60e85a1931d042d3e24d9549':
  Fixing improper boxing to Integer instead of Long.
 2011-03-15 11:30:08 -07:00
Brad Fitzpatrick
cd7dfcec4b am 40b207c1: Merge "Using proper key for removing object from the map." 
* commit '40b207c131e224554e30cde30fe4ee49817432ee':
  Using proper key for removing object from the map.
 2011-03-15 11:30:04 -07:00
Brad Fitzpatrick
c73c4a36d2 am b37f7e59: Merge changes I81fc2f90,I5e7fd759 
* commit 'b37f7e59ee38472bdd3ca5fe66cc847890c862e2':
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
 2011-03-15 11:29:56 -07:00
Brad Fitzpatrick
8d25eab105 Merge "Releasing lock even if exception is thrown." 2011-03-15 11:23:44 -07:00
Brad Fitzpatrick
8b5345fb36 Merge "Fixing self-assignment in copying code." 2011-03-15 11:18:18 -07:00
Brad Fitzpatrick
9a01a2f272 Merge "Fixing self-assignment in cloning code." 2011-03-15 11:15:19 -07:00
Brad Fitzpatrick
29d75c9a10 Merge "Fixing improper boxing to Integer instead of Long." 2011-03-15 11:03:29 -07:00
Brad Fitzpatrick
40b207c131 Merge "Using proper key for removing object from the map." 2011-03-15 11:00:51 -07:00
Brad Fitzpatrick
b37f7e59ee Merge changes I81fc2f90,I5e7fd759 
* changes:
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
 2011-03-15 10:56:16 -07:00
Dianne Hackborn
cffde30fc1 am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread 
* commit '44220a56026ead4583a9db96ced5f1113d4b4f07':
  Add some debug code to try to track down issue 3183612
 2011-03-15 10:52:27 -07:00
Dianne Hackborn
44220a5602 Merge "Add some debug code to try to track down issue 3183612" into gingerbread 2011-03-15 10:29:04 -07:00
Dianne Hackborn
cf3004a46e Add some debug code to try to track down issue 3183612 
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.

Change-Id: I3e84f8795941744e697824a5e5b2e651f565b253
 2011-03-14 14:24:04 -07:00
Mike Lockwood
ccdac700df am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread 
* commit '78b8e1be97c61f7e0b28b145fadd0c646fd1c46b':
  DO NOT MERGE: backport recent USB accessory changes from honeycomb
 2011-03-14 13:37:54 -07:00
Simon Wilson
81e1ed7eb5 am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread 
* commit 'ee3f6ef2fc7bcfae9d8af8430760388f653a10c8':
  DO NOT MERGE Support WiMAX Settings & ticker message
 2011-03-14 13:34:18 -07:00
Mike Lockwood
78b8e1be97 Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread 2011-03-14 13:17:24 -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
Simon Wilson
ee3f6ef2fc Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread 2011-03-14 11:40:17 -07:00
TK MUN
9999ad20df DO NOT MERGE Support WiMAX Settings & ticker message 
Change to save UI setting value
Add new Icons for ticker message

Change-Id: I3294f40c9853311f74877e197675f48bf271d468
 2011-03-14 11:39:01 -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
Mike Lockwood
2cc0377200 DO NOT MERGE: backport recent USB accessory changes from honeycomb 
Bug: 4082651

Change-Id: Ie7c2fc796dd3c64f803acbd14210e5949683f4ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 20:02:43 -05:00
Nick Pelly
38d0d5628d am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base). 
* commit '367f41f8f61126c2ab34a34cc676756a9fc23ac2':
  Implement new NFC-EE API's as shared library (frameworks/base).
 2011-03-10 16:32:28 -08:00
Nick Pelly
367f41f8f6 Implement new NFC-EE API's as shared library (frameworks/base). 
Change-Id: I45c4eaf59ec78167fc236fdd59676465a5e1bcb7
 2011-03-10 16:03:46 -08:00
TK MUN
c01fd043a9 am 4bdab175: DO NOT MERGE WiMAX support 
* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
  DO NOT MERGE WiMAX support
 2011-03-09 22:54:44 -08:00
TK MUN
4bdab1751f DO NOT MERGE WiMAX support 
- In Connectivity service, start WiMAX service
- 4G icon display in StatusBarPolicy
- Add DHCP renew
- Add radio for WiMAX

Change-Id: Iffff012b270d80e84ec8fbd4486921a8adb847dd
Signed-off-by: TK MUN <tk.mun@samsung.com>
 2011-03-09 22:37:08 -08:00
Mathias Agopian
b4341ba697 am b710a50a: Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread 
* commit 'b710a50ab6ca36b502f548e8551f620e98bbb1d8':
  fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]
 2011-03-09 16:57:32 -08:00
Mathias Agopian
a7c836ddc0 am c05d35db: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread 
* commit 'c05d35db1c57de97888f16ed74718e4c676e4a9b':
  fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]
 2011-03-09 16:57:28 -08:00
Mathias Agopian
5f94c315a6 fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE] 
make sure to not pass negative numbers to sqrt().

Change-Id: Ia31f7ebb7b75c79b548e428c6084fa55031617d0
related-bug: 3452750
 2011-03-07 17:58:56 -08:00
Mathias Agopian
241d8a84e5 fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE] 
Just make sure to clamp the argument to zero.

Bug: 4026375
Change-Id: Idd3d4ef977e87c1b3f6b54371105c3152d7dc6b9
 2011-03-07 17:58:34 -08:00
Soojung Shin
fa680a18f6 am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding. 
* commit 'ff5a09904fb05f2776f1bbf1dd3915f38031190c':
  Added to check for supporting mms content-disposition, utf8 decoding.
 2011-03-04 17:16:49 -08:00
Soojung Shin
ff5a09904f Added to check for supporting mms content-disposition, utf8 decoding. 
Change-Id: Ieae1bb2ac36675f569fb21285ca6ef289c367bf7
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
 2011-03-04 14:32:31 -08:00
Lorenzo Colitti
362da50989 am b028ce55: Merge "Add a protocol property to the APNs and use it." into gingerbread 
* commit 'b028ce55cac88f1778cdad59c63c52a5b66afb69':
  Add a protocol property to the APNs and use it.
 2011-03-03 17:07:56 -08:00
Lorenzo Colitti
b028ce55ca Merge "Add a protocol property to the APNs and use it." into gingerbread 2011-03-03 17:04:07 -08:00
Jozef BABJAK
0dbe721d0a Fixing improper boxing to Integer instead of Long. 
This is tricky: entry.getMessageBox() returns int, so it is
by default boxed to Integer. Map.get() however accepts Objects,
so it ignores the difference, but nothing is find during lookup,
just because Long and Integer objects are compared using equals(),
which has to lead to 'false' result. So, explicit boxning to Long
is unnecessary here.

Change-Id: I967a7829a8926410a00274c6b5e312e1af567299
 2011-03-03 10:09:53 +01:00
Simon Wilson
3d79f1ce84 am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread 
* commit 'edc68a001cd94d2011029004cb27231432a18575':
  Attempt to reduce problems from issue #3183612
 2011-03-02 18:10:33 -08:00
Simon Wilson
edc68a001c Merge "Attempt to reduce problems from issue #3183612" into gingerbread 2011-03-02 18:03:52 -08:00
Mike Lockwood
7866be2b76 am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread 
* commit '40bbf9295d5245d3917629ce15f7b37670aef1ac':
  DO NOT MERGE: Backport USB accessory support to gingerbread
 2011-03-02 15:16:32 -08:00
Mike Lockwood
40bbf9295d DO NOT MERGE: Backport USB accessory support to gingerbread 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-01 23:09:12 -08:00
Costin Manolache
66d46ac614 am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread 
* commit 'db52ab69f22e24615eaa2e8f9845e157426d3dd6':
  DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
 2011-03-01 12:29:40 -08:00
Costin Manolache
db52ab69f2 Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread 2011-03-01 12:25:21 -08:00
Costin Manolache
ef419b2e14 DO NOT MERGE 
Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.

This is backward compatible - both new and old authenticators will work with old and new framework,
but the functionality will only be present if both sides support it.

Change-Id: Ib2838cc2159f45264b38c844cd4c1d6f315d8064
 2011-03-01 11:20:06 -08:00
Jaikumar Ganesh
516393faba am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT." 
* commit '9711b9b7aa7448b44b85fe8158ded0364cc3540e':
  Phone crash when old callback func is woken up when enabling BT.
 2011-02-28 16:27:16 -08:00
Jaikumar Ganesh
9711b9b7aa am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT." 
* commit '1eefb529c78be5336f6c8a1b8ac2c32e268d4294':
  Phone crash when old callback func is woken up when enabling BT.
 2011-02-28 16:00:01 -08:00
Jaikumar Ganesh
1eefb529c7 Merge "Phone crash when old callback func is woken up when enabling BT." 2011-02-28 15:33:34 -08:00
Mike Lockwood
fc88f94fc3 am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread 
* commit '6da062a96c6f8126aad450a937144fab4333488f':
  DO NOT MERGE: Clean up USB notifications:
 2011-02-28 13:18:02 -08:00
Mike Lockwood
54e96c69d0 am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread 
* commit '3333f8afb2d1eae8bfdb41fa87f86836ad8702f7':
  DO NOT MERGE UsbManager: squashed commit of:
 2011-02-28 13:17:58 -08:00
Mike Lockwood
f41768c583 am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread 
* commit 'f7b99b32ad7a4872376355acabb5984142ba5e75':
  Give system server permission to access USB. DO NOT MERGE
 2011-02-28 13:17:54 -08:00
Lorenzo Colitti
3c4e929cfd Add a protocol property to the APNs and use it. 
1. Database changes:
   - Add a protocol and a roaming_protocol column to the
     carriers table in the telephony provider database.
   - Set the protocol and roaming_protocol fields when
     creating APN objects from the database.

2. ApnSetting class changes:
   - Add protocol and roamingProtocol fields to the
     ApnSetting class that encapsulates APN settings within
     the framework.
   - Add the fields to ApnSetting.toString and support a new
     syntax containing the fields in ApnSetting.fromString.
   - Add a unit test for ApnSetting.

3. Telephony changes:
   - Specify the APN protocol when setting up a data call,
     using protocol when not roaming and roaming_protocol
     when roaming.

This change depends on #86896 in the telephony provider,
which adds the new column to the database schema on
upgrades.

Bug: 3333633
Change-Id: If3d9ed4c851d0192849df0d64581db03b066e052
 2011-02-28 11:17:05 -08:00