Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,268 Commits 3 Branches 0 Tags
2d8500d21a3fe6af36040a5dcd0599e00a242766
Commit Graph

49268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
2d8500d21a am 799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE 
* commit '799f04c09cc7284e0660d419bcb24af57b86f08e':
  Report data status from ApnContext even if data is detached
 2011-06-08 15:03:43 -07:00
Wink Saville
a384ff3282 am 33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTE 
* commit '33e1424b2e924e9b0162aa648137e8254f729161':
  Use CSIM to get provision information
 2011-06-08 15:03:35 -07:00
Wink Saville
799f04c09c Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE 2011-06-08 15:00:46 -07:00
Wink Saville
33e1424b2e Merge "Use CSIM to get provision information" into honeycomb-LTE 2011-06-08 14:58:53 -07:00
Jean-Baptiste Queru
ed17165a14 am 0315a2c5: (-s ours) am f3894a04: Merge "Tweak setViewport stuff for fwd-compat" 
* commit '0315a2c5640dc91cd1689db9dff997e43e4effca':
  Tweak setViewport stuff for fwd-compat
 2011-06-08 14:14:56 -07:00
Jean-Baptiste Queru
0315a2c564 am f3894a04: Merge "Tweak setViewport stuff for fwd-compat" 
* commit 'f3894a04acb9cdd67a02a1a4c82ba7d178c13000':
  Tweak setViewport stuff for fwd-compat
 2011-06-08 14:07:19 -07:00
John Wang
1861225be3 am fe682fd7: am cea03df2: Do not merge. Return null id for Non-phone device. 
* commit 'fe682fd74d96f5a72259aed6dd27c02c8fc7caf7':
  Do not merge. Return null id for Non-phone device.
 2011-06-08 14:04:37 -07:00
Jeff Brown
92110af24a am 5f0b1721: am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2 
* commit '5f0b1721eece5ca614044cda638f11fbec0eab0a':
  Fix swipe gesture cosine calculation. Bug: 4124987
 2011-06-08 14:04:33 -07:00
John Wang
fe682fd74d am cea03df2: Do not merge. Return null id for Non-phone device. 
* commit 'cea03df201dc6659654234bc5fbfebf1b6a06e42':
  Do not merge. Return null id for Non-phone device.
 2011-06-08 13:52:26 -07:00
Jeff Brown
5f0b1721ee am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2 
* commit '25bd8abce993e17b382ea5c29a1cb68dd095cf45':
  Fix swipe gesture cosine calculation. Bug: 4124987
 2011-06-08 13:52:22 -07:00
Jean-Baptiste Queru
f3894a04ac Merge "Tweak setViewport stuff for fwd-compat" 2011-06-08 13:10:58 -07:00
John Wang
cea03df201 Do not merge. Return null id for Non-phone device. 
For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
 2011-06-08 13:10:22 -07:00
Kazuhiro Ondo
2e994586ed Report data status from ApnContext even if data is detached 
While in HO, data connection type may temporary become "unknown".
This triggers TelephonyRegistry picks up the wrong data connection
state, ending up notifying bogus state to ConnectivityService.

The patch is just to pick up the status from ApnContext which
should be maintaining the right state. Also cleaned up unnecessary
lines which was added earlier phase.

Change-Id: I07e74ce55f09ad31f2d8d09e2a144dc0b600eb0c
 2011-06-08 13:05:32 -07:00
Jean-Baptiste Queru
de26719153 Tweak setViewport stuff for fwd-compat 
Change-Id: I532336eced54544115dfd47d5557cc77bafdfc87
 2011-06-08 13:00:58 -07:00
Wink Saville
0da86d4fef am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE 
* commit 'a558fdf156601a477964139fee57da29de7f31b3':
  Fix default preferred network.
 2011-06-08 12:59:37 -07:00
Kazuhiro Ondo
53f67f7e9d Use CSIM to get provision information 
In case of LTE & CDMA hybrid system, provision information will be
read from CSIM records.

Also CSIM records can be updated over the air. No data connection
attempt should be made until CSIM provisioning is notified
via SIM_REFRESH event.

Change-Id: I001db48d07d90af22104cb958df638e15e0d494a
 2011-06-08 12:59:22 -07:00
Wink Saville
a558fdf156 Merge "Fix default preferred network." into honeycomb-LTE 2011-06-08 12:56:27 -07:00
Wink Saville
d6bcfd1cd0 Fix default preferred network. 
Also, for xoom-cdma-lte devices CdmaLteServiceStateTracker#getOtasp
returns OTASP_NOT_NEEDED.

Some cleanup.


Bug: 4531115
Change-Id: I24b160062eda625ff5c3471399b9e83ae0d2869a
 2011-06-08 12:18:07 -07:00
Jeff Brown
25bd8abce9 Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2 2011-06-07 16:58:06 -07:00
Jeff Brown
6674d9bf0a Fix swipe gesture cosine calculation. 
Bug: 4124987

Recent changes introduced a multiplication factor into the
distance calculation which ended up being absent from the
dot product calculation.

Change-Id: Ia367912b9ac09b6285d5a498a0c271563c9e9e39
 2011-06-07 16:50:14 -07:00
Adam Powell
4e1504a66b am 7ed8ff18: am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2 
* commit '7ed8ff18ce16312b86bd7da855e185b9ecc934a8':
  Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
 2011-06-07 16:37:35 -07:00
Jake Hamby
22165bb54a am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp 
* commit 'ae62b7b0bca9c46dea30ee81a7aada3e7576638b':
  Fixes for SMS Cell Broadcast support.
 2011-06-07 16:32:10 -07:00
Jake Hamby
ae62b7b0bc resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp 
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
 2011-06-07 16:24:15 -07:00
Adam Powell
7ed8ff18ce am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2 
* commit '68b81434963db90e0d5b14710e4edd86084ede3c':
  Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
 2011-06-07 16:22:32 -07:00
Adam Powell
68b8143496 Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2 2011-06-07 16:19:26 -07:00
Adam Powell
982cb98393 Fix bug 4533120 - rough handling of invalid event streams in 
ScaleGestureDetector

Make ScaleGestureDetector a bit more tolerant of bogus event streams.

Change-Id: I28a8b1ea494b7f1ca9d4c4623b95aee38f213369
 2011-06-07 16:13:51 -07:00
John Wang
229d3a0cbc am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE 
* commit 'fc94d45fc209dbcfdf7f57e0c04c581e1e51988b':
  Make getDeviceId return null for Non-phone device.
 2011-06-07 15:56:19 -07:00
Dianne Hackborn
816e5b7219 am ee3de4a9: am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2 
* commit 'ee3de4a950a188c6a4d5fb732242249af4807837':
  Remove compat mode dialog.
 2011-06-07 15:56:05 -07:00
Dianne Hackborn
891266e36e am b5b98f87: am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 
* commit 'b5b98f877a09907a9a3b0c7e590e6e0ddd575158':
  DO NOT MERGE. Experimental compatibility mode UI.
 2011-06-07 15:52:38 -07:00
John Wang
fc94d45fc2 Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE 2011-06-07 15:49:34 -07:00
Dianne Hackborn
ee3de4a950 am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2 
* commit 'a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5':
  Remove compat mode dialog.
 2011-06-07 15:47:14 -07:00
Dianne Hackborn
a3ce0f1e6f Merge "Remove compat mode dialog." into honeycomb-mr2 2011-06-07 15:45:14 -07:00
Dianne Hackborn
2947826931 Remove compat mode dialog. 
Change-Id: I37bccdf9d3e7c56048633da5731ad111910e530f
 2011-06-07 15:44:22 -07:00
Dianne Hackborn
b5b98f877a am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 
* commit 'dfe824ef3e5d8b2adac97c667cd51c7dfdb3c7af':
  DO NOT MERGE. Experimental compatibility mode UI.
 2011-06-07 15:39:43 -07:00
John Wang
e19736f052 Make getDeviceId return null for Non-phone device. 
For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
 2011-06-07 15:37:09 -07:00
Dianne Hackborn
dfe824ef3e Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 2011-06-07 15:36:51 -07:00
Xavier Ducrohet
3eb9f8326e am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread 
* commit '67f09cd090adae6365ca36546b0a517e51255876':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.
 2011-06-07 15:09:39 -07:00
Xavier Ducrohet
e1d14a29ff am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread 
* commit 'ab3f5779aecb46d7ddfb141f9b0ff8fc0eaed17f':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.
 2011-06-07 15:09:31 -07:00
Romain Guy
34e9f249a9 am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called." 
* commit 'fbef58faad5a31faf36294e4d160cbd148ed5458':
  Disable plugins if setPluginsEnabled(false) called.
 2011-06-07 15:09:02 -07:00
Jake Hamby
7ca13deb40 Merge "resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-06-07 15:03:51 -07:00
Mathias Agopian
c8c39b6c5b am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE) 
* commit 'a6a4a9ed46d02ec0c6493a97cd1d3351bdcced63':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)
 2011-06-07 15:02:53 -07:00
Jake Hamby
7d259626d0 resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp 
Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2
 2011-06-07 15:01:50 -07:00
Mathias Agopian
a6a4a9ed46 am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE) 
* commit 'f6c8206735e7e078461e5f2aef6e1a1446fdd075':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)
 2011-06-07 14:58:02 -07:00
Mathias Agopian
f6c8206735 fix a surface leak introduced by a failed merge (DO NOT MERGE) 
Bug: 4558502
Change-Id: Ibf889d03caa806c34603ad45f135b78c3851f55c
 2011-06-07 14:52:22 -07:00
Daniel Sandler
56e6dbd8b1 DO NOT MERGE. Experimental compatibility mode UI. 
♫ Just another button, for you and me, in the status bar. ♫

(cherry picked from commit 45c0401a06)

Change-Id: Ib35d136deadf16f693003b61ea6cfee411f4aa3d
 2011-06-07 14:11:09 -07:00
Irfan Sheriff
92593dc49b am 84db79bb: Merge "Clear IP configuration on lost network" into honeycomb-LTE 
* commit '84db79bb65bce5c1fd8a6e033cb7e4db4c04f9b1':
  Clear IP configuration on lost network
 2011-06-07 13:44:40 -07:00
Irfan Sheriff
84db79bb65 Merge "Clear IP configuration on lost network" into honeycomb-LTE 2011-06-07 13:40:38 -07:00
Andreas Huber
752a5b3df5 am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls. 
* commit '8e97372913c9236ffdee175c6da99dc00c22b3e1':
  DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
 2011-06-07 13:23:54 -07:00
Martijn Coenen
4c5f2a9dd2 am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records. 
* commit 'ed1c8d7dc09996351db711be7d2acf0ff4715c2d':
  Prevent allocation overflows by corrupt NDEF records.
 2011-06-07 13:23:11 -07:00
John Wang
1f8665895f am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 
* commit '71030e536522449f34dc584fda94f34e7be6ee19':
  Add SIM PUK unlockscreen.
 2011-06-07 13:16:09 -07:00