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

49319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
dc03da0444 am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 
* commit '2488a94350e0c0b088da2646557c9a0f3a0e9847':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
 2011-06-09 12:50:25 -07:00
Mike Lockwood
6d60190a31 am e502c536: am b3174c46: UsbService: Fix JNI reference leak 
* commit 'e502c5364f8e715eb0da54441460b8f3cb76b7ff':
  UsbService: Fix JNI reference leak
 2011-06-09 12:50:23 -07:00
Justin Ho
e9f203e443 am 9b0a8f9a: am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 
* commit '9b0a8f9a92b7b4579ecf5973d3fe61da7950fa93':
  Updating default wallpaper of large devices to match xlarge
 2011-06-09 12:50:10 -07:00
Xavier Ducrohet
48305f327f am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2 
* commit '2e0f71181792780b55826bcc562ae79951e76f1b':
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
 2011-06-09 12:49:55 -07:00
Conley Owens
e668c0b698 am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 
* commit '644f36eab4eb9911ad897c9caae68b9c5a72388f':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
 2011-06-09 12:21:05 -07:00
Conley Owens
644f36eab4 am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 
* commit 'd8b027b18f5a922ef729c6ee363eecb053358d47':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
 2011-06-09 12:14:11 -07:00
James Dong
2488a94350 am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 
* commit 'e3b80c838753fe8c9049950216c6379098465810':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
 2011-06-09 12:03:52 -07:00
Mike Lockwood
e502c5364f am b3174c46: UsbService: Fix JNI reference leak 
* commit 'b3174c46ade0be4628813a74b317da538e367bc8':
  UsbService: Fix JNI reference leak
 2011-06-09 12:01:31 -07:00
James Dong
e3b80c8387 Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 2011-06-09 11:56:09 -07:00
Mike Lockwood
b3174c46ad UsbService: Fix JNI reference leak 
http://code.google.com/p/android/issues/detail?id=17365

Change-Id: Ice0174e0db2a785d32ac16694ebf3b7ddb1b7fb3
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-09 14:48:11 -04:00
Marco Nelissen
6a91953cc9 am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds 
* commit '90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f':
  Make sure we don't read from invalid fds
 2011-06-09 11:41:57 -07:00
Conley Owens
d8b027b18f Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 2011-06-09 11:12:04 -07:00
Marco Nelissen
90dc22fa09 am a02d9bf9: Make sure we don\'t read from invalid fds 
* commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
  Make sure we don't read from invalid fds
 2011-06-09 10:36:24 -07:00
Justin Ho
9b0a8f9a92 am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 
* commit '1d3173c3dc93bb4f2efc5b059fec8e7577b3258a':
  Updating default wallpaper of large devices to match xlarge
 2011-06-09 10:22:17 -07:00
Xavier Ducrohet
2e0f711817 am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2 
* commit '8ee28811ad208d224ac8d317e4644aabc9ffb886':
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
 2011-06-09 10:19:14 -07:00
Justin Ho
1d3173c3dc Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 2011-06-09 10:18:13 -07:00
Xavier Ducrohet
8ee28811ad Merge changes Idbb70f53,I10426a3f into honeycomb-mr2 
* changes:
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
 2011-06-09 10:12:40 -07:00
Justin Ho
3116496837 Updating default wallpaper of large devices to match xlarge 
Change-Id: I3fbcefce70e862fdc8e332f919485f1ec904a1b1
 2011-06-09 09:42:22 -07:00
Marco Nelissen
a02d9bf9c3 Make sure we don't read from invalid fds 
b/4580570

Change-Id: I622f001551a404a7a840d8388a9febac2db107ad
 2011-06-09 09:39:52 -07:00
Dianne Hackborn
8297f66935 am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 
* commit '3aabdeaceff8405406d90c329a6691552559556d':
  Fix for not reporting correct "sw" in compat mode.
 2011-06-08 22:38:03 -07:00
Dianne Hackborn
3aabdeacef am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 
* commit '5ba2e872fa684c0f1b992a95df00854b58f2cd8c':
  Fix for not reporting correct "sw" in compat mode.
 2011-06-08 22:35:25 -07:00
Dianne Hackborn
5ba2e872fa Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 2011-06-08 22:33:34 -07:00
Dianne Hackborn
48a7651823 Fix for not reporting correct "sw" in compat mode. 
Change-Id: Ia225c94b36ccc3589d417aafd5680247678eddfd
 2011-06-08 22:26:33 -07:00
Dianne Hackborn
9dfd7d0a47 am 2d618e41: am e22fe933: Fix issue #4582417: Need to add new PackageManager... 
* commit '2d618e415fa0ed8a1e7ac8d0ffe98cebdf6c208b':
  Fix issue #4582417: Need to add new PackageManager...
 2011-06-08 21:41:55 -07:00
Dianne Hackborn
2d618e415f am e22fe933: Fix issue #4582417: Need to add new PackageManager... 
* commit 'e22fe9331ad8a9f81470751fdeca7633f654cffa':
  Fix issue #4582417: Need to add new PackageManager...
 2011-06-08 21:38:33 -07:00
John Wang
4d04204824 am 08a8f3f9: Merge "Set emergency call text visibility." into honeycomb-LTE 
* commit '08a8f3f9dc035bc462061ae87090a8da59c6713a':
  Set emergency call text visibility.
 2011-06-08 20:41:41 -07:00
John Wang
08a8f3f9dc Merge "Set emergency call text visibility." into honeycomb-LTE 2011-06-08 20:38:59 -07:00
Dianne Hackborn
e22fe9331a Fix issue #4582417: Need to add new PackageManager... 
...FEATURE_ constant for FAKE_MULTITOUCH in MR2

Change-Id: Ib6950d9dbdd58618aec593de7e0cf1c01b7d6ef9
 2011-06-08 20:38:41 -07:00
Mathias Agopian
60ee24fe48 am 17574b9a: (-s ours) am 19974ecc: Fix a leak in RefBase (DO NOT MERGE) 
* commit '17574b9a0a7cc1cf215935fce2474ca30d387046':
  Fix a leak in RefBase (DO NOT MERGE)
 2011-06-08 20:19:28 -07:00
Dianne Hackborn
e2aa04908c am a1396dfe: am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2 
* commit 'a1396dfe7ad6ec6953f544be42d69d7804ab0fd4':
  Work on issue #4518815: Compatibility mode introduces compatibility regression...
 2011-06-08 20:06:40 -07:00
Dianne Hackborn
a1396dfe7a am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2 
* commit '021408910af170268cb486910d4dd5a7d838c2bb':
  Work on issue #4518815: Compatibility mode introduces compatibility regression...
 2011-06-08 20:02:43 -07:00
Dianne Hackborn
021408910a Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2 2011-06-08 20:00:50 -07:00
Mathias Agopian
17574b9a0a am 19974ecc: Fix a leak in RefBase (DO NOT MERGE) 
* commit '19974eccdbd3e4dbd7e3b2cc401db7806d4a17bc':
  Fix a leak in RefBase (DO NOT MERGE)
 2011-06-08 19:56:06 -07:00
John Wang
5328bf0b2e Set emergency call text visibility. 
Set emergency call text visibility based on
emergencyCallCapable config for sim missing
and networklock screens.

bug:4392059
Change-Id: Ibfe92405ada7b452927940295c090d88ecd79519
 2011-06-08 19:51:57 -07:00
John Wang
3948a2b420 am 735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE 
* commit '735463d1d9a1e490fa6b30d4273d24fc2f12bcd9':
  Fix layout issue on Xoom when device thinks there's a SIM.
 2011-06-08 19:41:39 -07:00
John Wang
735463d1d9 Merge "Fix layout issue on Xoom when device thinks there's a SIM." into honeycomb-LTE 2011-06-08 19:37:56 -07:00
Mathias Agopian
96fcb702d7 am b40e85f9: am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2 
* commit 'b40e85f90146a654bfe5657187be491147814ea0':
  Fix a leak in RefBase
 2011-06-08 19:34:30 -07:00
Mathias Agopian
b40e85f901 am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2 
* commit '645434fb4eff408698423d70904fb8fc709a5225':
  Fix a leak in RefBase
 2011-06-08 19:30:47 -07:00
Mathias Agopian
645434fb4e Merge "Fix a leak in RefBase" into honeycomb-mr2 2011-06-08 19:28:39 -07:00
Jim Miller
b0cdc2baa5 Fix layout issue on Xoom when device thinks there's a SIM. 
bug:4411799
Change-Id: I2c7deff557bcd226444730401c8347ea3d6cab56
 2011-06-08 18:48:58 -07:00
Dianne Hackborn
5fd2169eab Work on issue #4518815: Compatibility mode introduces compatibility regression... 
...for Market App iRunner

There were a lot of serious issues with how we updated (or often didn't update)
the display and resource state when switching compatibility mode in conjunction
with restarting and updating application components.  This addresses everything
I could find.

Unfortunately it does *not* fix this particular app.  I am starting to think this
is just an issue in the app.  This change does fix a number of other problems
I could repro, such as switching the compatibility mode of an IME.

Also a few changes here and there to get rid of $#*&^!! debug logs.

Change-Id: Ib15572eac9ec93b4b9966ddcbbc830ce9dec1317
 2011-06-08 18:45:43 -07:00
Adam Powell
fb339016ff am 73d54e7b: am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2 
* commit '73d54e7b54f95401ad290bf9d305cad449db7ae3':
  Public styles for action bar tabs
 2011-06-08 17:16:16 -07:00
Xavier Ducrohet
45b662e1bc Merge 06942bc4 from hc-mr1. 
Layoutlib - use the new getParser callback when possible.

Change-Id: Idbb70f5391addd539afa5c2f5b55c70beefed223
 2011-06-08 17:11:40 -07:00
Xavier Ducrohet
beb5fb622b Merge 988eeeb5 from hc-mr1. 
Support for custom declare-styleable attr with enum/flag in layoutlib.

Change-Id: I10426a3f2c76bed207c03fab7885b4269337a70f
 2011-06-08 17:10:11 -07:00
Adam Powell
73d54e7b54 am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2 
* commit '4381f6421ca408d1dc66430ddfb107c5011bfe25':
  Public styles for action bar tabs
 2011-06-08 16:58:35 -07:00
Adam Powell
4381f6421c Merge "Public styles for action bar tabs" into honeycomb-mr2 2011-06-08 16:54:50 -07:00
Mathias Agopian
2c0042b666 Fix a leak in RefBase 
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).

Change-Id: Id85e749ba04521199555dd701198edd097c313d4
 2011-06-08 16:25:01 -07:00
Mathias Agopian
19974eccdb Fix a leak in RefBase (DO NOT MERGE) 
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).

Change-Id: Ia9b155fbfa643ef72cfb8129e96260a3b806a78c
 2011-06-08 16:13:39 -07:00
Adam Powell
1a4678b93f Public styles for action bar tabs 
Change-Id: Id77d32c6d83ea72662ae8972710860f5fe42e617
 2011-06-08 15:13:50 -07:00
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