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

67600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Hines
0599d6ede3 Merge "Fix typos/spacing with new APIs." 2012-02-14 13:38:43 -08:00
Robert Greenwalt
c8711ca7eb Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 2012-02-14 13:38:15 -08:00
Robert Greenwalt
fc19160a6a Merge "Add a config to set Dun capabilities." into ics-mr1 2012-02-14 13:37:44 -08:00
Stephen Hines
10e9f39f1d Merge "Initialize all class members." 2012-02-14 13:35:21 -08:00
Justin Ho
e6ccc94ef9 am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1 
* commit 'c312ba322b5f204753a2ad8e40062c26114a15d8':
  Update 4G WiMAX assets for notification area as well Bug: 5724605
 2012-02-14 13:31:00 -08:00
Joe Fernandez
8f01c1fe1e am c9f1eb20: am 6a9beb53: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1 
* commit 'c9f1eb20033d50dadbe028985bedc5022c50ce4c':
 2012-02-14 13:30:50 -08:00
Mike Lockwood
7d451e2f7f am ac7ab269: am 5f423d88: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1 
* commit 'ac7ab269e5a8c3d25ac243efcc92cc791002e6b9':
 2012-02-14 13:30:47 -08:00
John Wang
ef7e8a8a32 am 71bece56: am 749b32df: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 
* commit '71bece56377896f4799a6d480c459c4344050e64':
 2012-02-14 13:30:46 -08:00
Justin Ho
c312ba322b Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1 2012-02-14 13:29:08 -08:00
Joe Fernandez
2102ce91ea am 08851a53: am 57f55d7f: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1 
* commit '08851a53a147a4022a37fb61ba17fd2876d2afc5':
  docs: Android NDK r7b Release Notes
 2012-02-14 13:08:04 -08:00
Mike Lockwood
ef9d55a6b0 am 8f7cc7af: am b9be8eff: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1 
* commit '8f7cc7af66520e3bd5e59e8eadb6907e3e043661':
  Don't pulse LED on new notification unless notification has LED flag set
 2012-02-14 13:08:01 -08:00
John Wang
286b364c7b am 0b17fc36: am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 
* commit '0b17fc360185ca7b9d05a096b0033ddd8d883940':
  Only use CDMA rssi for config_alwaysUseCdmaRssi.
 2012-02-14 13:07:58 -08:00
Joe Fernandez
c9f1eb2003 am 6a9beb53: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1 
* commit '6a9beb536f13c4df178cbe67c74c30d258bef28f':
 2012-02-14 13:06:16 -08:00
Mike Lockwood
ac7ab269e5 am 5f423d88: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1 
* commit '5f423d88753e7c123527d4b7b940788eb2c94821':
 2012-02-14 13:06:14 -08:00
John Wang
71bece5637 am 749b32df: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 
* commit '749b32dfe6ece3ce6ced71d05351a1139d4a4cd4':
 2012-02-14 13:06:11 -08:00
Teng-Hui Zhu
728f1ed5e3 Merge "Update the scale while updating the drawGL functor" 2012-02-14 12:51:19 -08:00
Joe Fernandez
08851a53a1 am 57f55d7f: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1 
* commit '57f55d7f9cc1d194054020fcb4e6226579818e27':
  docs: Android NDK r7b Release Notes
 2012-02-14 12:42:44 -08:00
Mike Lockwood
8f7cc7af66 am b9be8eff: am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1 
* commit 'b9be8eff222d9b70079dd53d0d61de229d8d7914':
  Don't pulse LED on new notification unless notification has LED flag set
 2012-02-14 12:42:42 -08:00
John Wang
0b17fc3601 am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 
* commit '252c64f9c3e2e357f8687e18d8a066cc1cdb8c15':
  Only use CDMA rssi for config_alwaysUseCdmaRssi.
 2012-02-14 12:42:40 -08:00
Joe Fernandez
6a9beb536f am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1 
* commit '835e07f8f437e1872451dd23c0faf925388e1aef':
  docs: Android NDK r7b Release Notes
 2012-02-14 12:37:43 -08:00
Mike Lockwood
5f423d8875 am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1 
* commit 'ffc89899652f5c815b6d156f55a909001420891e':
  Don't pulse LED on new notification unless notification has LED flag set
 2012-02-14 12:37:40 -08:00
John Wang
749b32dfe6 am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 
* commit '63b596664c3fdb70ad32c8f641f477ec9140d6ec':
  Only use CDMA rssi for config_alwaysUseCdmaRssi.
 2012-02-14 12:37:38 -08:00
Joe Fernandez
57f55d7f9c am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1 
* commit '835e07f8f437e1872451dd23c0faf925388e1aef':
  docs: Android NDK r7b Release Notes
 2012-02-14 12:37:18 -08:00
Mike Lockwood
b9be8eff22 am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1 
* commit 'ffc89899652f5c815b6d156f55a909001420891e':
  Don't pulse LED on new notification unless notification has LED flag set
 2012-02-14 12:37:16 -08:00
John Wang
252c64f9c3 am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 
* commit '63b596664c3fdb70ad32c8f641f477ec9140d6ec':
  Only use CDMA rssi for config_alwaysUseCdmaRssi.
 2012-02-14 12:37:14 -08:00
Mathias Agopian
80fe2c4e5e Merge changes I7a6b9db4,Ib579f580 
* changes:
  EGLConfig is now not remaped to an internal EGLConfig
  remove multiplexing of multiple EGL implementation
 2012-02-14 12:35:02 -08:00
Justin Ho
9dd3a66286 Update 4G WiMAX assets for notification area as well 
Bug: 5724605

Change-Id: Iade031923f1d3a07ca6dd366642c04071168d495
 2012-02-14 12:10:54 -08:00
Joe Fernandez
835e07f8f4 Merge "docs: Android NDK r7b Release Notes" into ics-mr1 2012-02-14 12:05:25 -08:00
Joe Fernandez
0ae5cacf6c docs: Android NDK r7b Release Notes 
Change-Id: Ib1a92b1bbdb190f3aae6dcc69a78cbf5ad3c4760
 2012-02-14 11:49:27 -08:00
Robert Greenwalt
2384386f31 Stop using shared DUN APN when tethering stops. 
Backported from master, including a bug fix and a cdma enhancement.

Even if other people are sharing the connection (ie, carrier wants
default and tethered traffic on the same APN) stop using a carrier-
described APN when the tethering stops.

bug:5972599
Change-Id: I25e4831855e6b62c0c3ab3a6f4d4846aaee6ac50
 2012-02-14 11:44:09 -08:00
Mike Lockwood
ffc8989965 Merge "Don't pulse LED on new notification unless notification has LED flag set" into ics-mr1 2012-02-14 11:30:05 -08:00
Teng-Hui Zhu
7e2346d51a Update the scale while updating the drawGL functor 
bug:6008955

webkit change:
https://android-git.corp.google.com/g/#/c/165734/

Change-Id: I5ba7998a6b8f33b44582b0158ba966054aaad2a8
 2012-02-14 11:29:52 -08:00
Robert Greenwalt
8d27f20ac2 Add a config to set Dun capabilities. 
Since CDMA doesn't use APN settings there was no place to say what a cdma
device's DUN connection would support, so by default normal device
originating traffic would be blocked on a tethering single-connection device.

With this change you can (via overlay) say that it supports everything
so mms and on-device browsing/email will still work even when on a dun connection.

The reason to allow both: some carriers will charge per byte for dun access
and so they don't want lots of non-tethering traffic used (costs the user alot)
but other carriers just use a dun connection to limit access to tethering, but
once there give unlimited data, so it makes sense to support everything there.

bug:5972599
Change-Id: I78fd7f3ac63c51a0560b659ed5ec219b10a93f8d
 2012-02-14 11:29:36 -08:00
John Wang
63b596664c Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 2012-02-14 10:09:26 -08:00
Jean-Baptiste Queru
9090a7a2fd Merge from master 
Change-Id: I72b13c6443acdfb1b9ad477942f32a925fde5c61
 2012-02-14 10:06:49 -08:00
Jean-Baptiste Queru
788efcf8ef Merge from master 
Change-Id: I62479982edbb2229f84d20a581cccb703bdfc87b
 2012-02-14 10:04:12 -08:00
Guang Zhu
e3a01395ae Merge "disable cpu_upload path workaround" 2012-02-14 10:02:44 -08:00
Guang Zhu
20a14ca937 disable cpu_upload path workaround 
Bug: 6008123

Change-Id: I9bee623827ad82185c77875ba317c2fd95f3fce8
 2012-02-14 10:01:46 -08:00
Jean-Baptiste Queru
35377f5c50 Merge from master 
Change-Id: Ib9bc82ee0517945c5a713692d748042601d406ef
 2012-02-14 09:57:40 -08:00
Ying Wang
3fb7ba1ed2 Merge "Build all font files as prebuilts." 2012-02-14 09:53:36 -08:00
Glenn Kasten
05bd19f608 Merge "Fix races related to volume and mute" 2012-02-14 09:44:47 -08:00
Glenn Kasten
1013f417b6 am 4f7adcf7: Merge "Update comments" 
* commit '4f7adcf76a6f97076c05720d9c20a221a57692cb':
  Update comments
 2012-02-14 09:43:45 -08:00
Glenn Kasten
4f7adcf76a Merge "Update comments" 2012-02-14 09:42:32 -08:00
Chet Haase
1ace2572b5 am c87b0084: Merge "Refactor animation code in new Draw() method into its own method." 
* commit 'c87b0084e3dbf5c0862d29f039ee908bccf39e9d':
  Refactor animation code in new Draw() method into its own method.
 2012-02-14 09:22:10 -08:00
Chet Haase
c87b0084e3 Merge "Refactor animation code in new Draw() method into its own method." 2012-02-14 09:19:59 -08:00
Glenn Kasten
b3db213eb5 Update comments 
We no longer put the filename at start of file.

Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
 2012-02-14 09:17:59 -08:00
Chet Haase
bcca79acb1 Refactor animation code in new Draw() method into its own method. 
Ongoing cleanup of View drawing code, continuation of drawChild() refactoring.

Change-Id: I6d7383bb858d39ced6917d559defe7713e53de38
 2012-02-14 09:16:39 -08:00
Glenn Kasten
422ab3f1e4 am f4e1bdc1: Merge "Remove dead code AudioTrack::getLoop" 
* commit 'f4e1bdc13e0c9bb6352e458bef283dfc7165e23f':
  Remove dead code AudioTrack::getLoop
 2012-02-14 09:10:39 -08:00
Glenn Kasten
fe93505ce1 am 150d238f: Use size_t and ssize_t with Vector 
* commit '150d238f3a5218846c5f16e64958079d22ac11c4':
  Use size_t and ssize_t with Vector
 2012-02-14 09:10:36 -08:00
Glenn Kasten
f4e1bdc13e Merge "Remove dead code AudioTrack::getLoop" 2012-02-14 09:09:03 -08:00