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

63256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ramanan Rajeswaran
128dfa5148 Merge "DO NOT MERGE" into ics-scoop-plus-aosp 2012-02-14 07:35:13 -08:00
Mike Lockwood
ece18efb35 Don't pulse LED on new notification unless notification has LED flag set 
Bug: 6006131

Change-Id: I719c7d68e310bfaca227f6286159b3993784926b
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-02-13 20:42:19 -08:00
Jean-Baptiste Queru
6466f400a4 am fca4ff38: am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call" 
* commit 'fca4ff3851508d9d2c414aa535a86d7ac0eb5e72':
  Fix incorrect prototype for JNI call
 2012-02-13 20:00:40 -08:00
Jean-Baptiste Queru
fca4ff3851 am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call" 
* commit 'eaf2617fc20dd6484722edc9df41faf6e91d73cc':
  Fix incorrect prototype for JNI call
 2012-02-13 19:58:09 -08:00
Jean-Baptiste Queru
eaf2617fc2 am 472512f6: Merge "Fix incorrect prototype for JNI call" 
* commit '472512f6970fa170e2e1a3e1c24ac2b742e2e6b6':
  Fix incorrect prototype for JNI call
 2012-02-13 19:55:52 -08:00
John Wang
d55cde1384 Only use CDMA rssi for config_alwaysUseCdmaRssi. 
If config_alwaysUseCdmaRssi is true, the RSSI signal bar only
shows the CDMA value, no matter it connects to EVDO or WiMax .

bug:5941743
Change-Id: I4187571898a9fb47162e1ccf0cc4c59c3136ae0b
 2012-02-13 17:48:24 -08:00
Ramanan Rajeswaran
68de7f5439 DO NOT MERGE 
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
 2012-02-13 15:21:04 -08:00
Tsu Chiang Chuang
8885596a91 am 3ded587c: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1 
* commit '3ded587cc199d4ba592e675dc47fb80a28d1dacd':
 2012-02-13 14:39:48 -08:00
Dianne Hackborn
84affb8ae6 Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
 2012-02-13 14:39:45 -08:00
Jean-Baptiste Queru
472512f697 Merge "Fix incorrect prototype for JNI call" 2012-02-13 14:32:33 -08:00
Ramanan Rajeswaran
352b8d03c6 am 8046e294: Merge "DO NOT MERGE" into ics-scoop 
* commit '8046e294c545b8e3712bff7925b024639936d5bf':
  DO NOT MERGE
 2012-02-13 14:24:38 -08:00
Ramanan Rajeswaran
8046e294c5 Merge "DO NOT MERGE" into ics-scoop 2012-02-13 14:22:44 -08:00
Ramanan Rajeswaran
9d29031417 DO NOT MERGE 
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
 2012-02-13 14:17:06 -08:00
Tsu Chiang Chuang
5f5ea91f60 am eb56ad18: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1 
* commit 'eb56ad183af8a9833ff22a22b97f174f05266c58':
  extending timeout to stabilize tests
 2012-02-13 13:45:06 -08:00
Tsu Chiang Chuang
3ded587cc1 am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1 
* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
  extending timeout to stabilize tests
 2012-02-13 13:43:07 -08:00
Tsu Chiang Chuang
eb56ad183a am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1 
* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
  extending timeout to stabilize tests
 2012-02-13 13:42:45 -08:00
Tsu Chiang Chuang
08eb7dd630 Merge "extending timeout to stabilize tests" into ics-mr1 2012-02-13 13:41:37 -08:00
Dianne Hackborn
d1f88de2c4 am c1496d2d: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
* commit 'c1496d2d9a496e4aba817a58ecb9e07fe55cdba5':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
 2012-02-13 12:38:37 -08:00
Dianne Hackborn
c1496d2d9a Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
 2012-02-13 12:01:56 -08:00
Wink Saville
5caed1d99b am f11b6fbf: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1 
* commit 'f11b6fbfc8bab9a09e37ef9866c0da247474f4cf':
 2012-02-10 15:28:54 -08:00
Wink Saville
e8b57feaab am 812c2ff6: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1 
* commit '812c2ff6312b25b9539399f38967f8a6ff40b733':
  Add OEM specific USB mode enumeration based on ro.bootmode property
 2012-02-10 15:17:12 -08:00
Wink Saville
812c2ff631 am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1 
* commit '197fe26940022be75384f4038dd789f446d33122':
  Add OEM specific USB mode enumeration based on ro.bootmode property
 2012-02-10 15:14:40 -08:00
Wink Saville
f11b6fbfc8 am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1 
* commit '197fe26940022be75384f4038dd789f446d33122':
  Add OEM specific USB mode enumeration based on ro.bootmode property
 2012-02-10 15:14:40 -08:00
Wink Saville
197fe26940 Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1 2012-02-10 15:12:19 -08:00
Eric Fischer
5b6f9bf51c am 8b6d7b06: am 650462bb: Import revised translations. DO NOT MERGE 
* commit '8b6d7b063b5a94b59b4a1132763f4644ee1d8545':
 2012-02-10 13:13:58 -08:00
Eric Fischer
ffb2473b3b am a2c92418: am 650462bb: Import revised translations. DO NOT MERGE 
* commit 'a2c9241869c14a058621668d65ca29fc8a867bbf':
  Import revised translations.  DO NOT MERGE
 2012-02-10 13:13:30 -08:00
Eric Fischer
a2c9241869 am 650462bb: Import revised translations. DO NOT MERGE 
* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
  Import revised translations.  DO NOT MERGE
 2012-02-10 13:11:46 -08:00
Eric Fischer
8b6d7b063b am 650462bb: Import revised translations. DO NOT MERGE 
* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
  Import revised translations.  DO NOT MERGE
 2012-02-10 13:11:45 -08:00
Eric Fischer
650462bbfd Import revised translations. DO NOT MERGE 
Change-Id: Ibfc588d17f79baa0359d3a20a0a5ff7a2f3f152b
 2012-02-10 12:29:26 -08:00
Kazuhiro Ondo
afd8f1820e Add OEM specific USB mode enumeration based on ro.bootmode property 
This patch is adding a capability so that OEM can override USB mode
in case the device is boot up with OEM specific mode. (i.e. modem
debug, factory test etc.)

Bug:5964042
Change-Id: Ic8e23d302563ce71eedb74ce94cca8c65838a4f7
 2012-02-10 12:29:12 -08:00
Justin Ho
25d1d268c1 am 0fc225ed: am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1 
* commit '0fc225ed37ec535ff9b5238f390a79dbaf7f377b':
 2012-02-10 10:49:48 -08:00
Justin Ho
f994f353f7 am 448249d1: (-s ours) am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1 
* commit '448249d1a7e0b871b9a9db49a45e0e51f6d36d65':
  Import translations. DO NOT MERGE
 2012-02-10 10:13:19 -08:00
Justin Ho
0fc225ed37 am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1 
* commit '744c5b0bdee6a26e2dc7e740a695d53c32104326':
  Import translations. DO NOT MERGE
 2012-02-10 10:10:39 -08:00
Justin Ho
448249d1a7 am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1 
* commit '744c5b0bdee6a26e2dc7e740a695d53c32104326':
  Import translations. DO NOT MERGE
 2012-02-10 10:09:42 -08:00
Justin Ho
744c5b0bde Merge "Import translations. DO NOT MERGE" into ics-mr1 2012-02-10 10:07:07 -08:00
Scott Main
b45087bf09 am 98c31334: am d9c8bbd5: docs: fix xss issue bug 5125642 
* commit '98c313340a46401adda86b398a7623f39aa8e412':
 2012-02-09 21:07:10 -08:00
Joe Fernandez
d2deae8f40 am a300ea98: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 
* commit 'a300ea98df80a2d72d6131902a8fb3dbf9a6ed14':
 2012-02-09 21:07:08 -08:00