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

63665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
29e03cde74 merge in ics-mr0-release history after reset to ics-mr0 2011-11-03 06:33:29 -07:00
Daniel Sandler
17fc092b5b am 1f42a3db: Merge "Bring back Android Dreams." into ics-mr1 
* commit '1f42a3db9e09138f92e8eb16c35cf50e92a88a46':
  Bring back Android Dreams.
 2011-11-03 10:58:30 +00:00
Daniel Sandler
1f42a3db9e Merge "Bring back Android Dreams." into ics-mr1 2011-11-03 03:56:49 -07:00
satok
ae8f846151 am cb1001b2: Merge "Fix a memory leak of a Binder in SpellCheckerService" into ics-mr1 
* commit 'cb1001b2829f7da86f66f2634bd40cbc51ba4998':
  Fix a memory leak of a Binder in SpellCheckerService
 2011-11-03 09:11:41 +00:00
satok
cb1001b282 Merge "Fix a memory leak of a Binder in SpellCheckerService" into ics-mr1 2011-11-03 02:09:32 -07:00
Jeff Sharkey
e5e0db8f3b am 808ee95d: Merge "Correct proc file reader, optimizations." into ics-mr1 
* commit '808ee95dd4244da6ae767d3ddd003ed7b48937d0':
  Correct proc file reader, optimizations.
 2011-11-03 07:34:13 +00:00
Jeff Sharkey
808ee95dd4 Merge "Correct proc file reader, optimizations." into ics-mr1 2011-11-03 00:32:22 -07:00
Dianne Hackborn
68d91733c8 Some optimizations for view inflation. 
Change-Id: I8e5e6dda4d4c9776961d4a070549d5753588e582
 2011-11-02 22:34:15 -07:00
Dianne Hackborn
87aa95b18c am 17bd9a22: Merge "More performance work:" into ics-mr1 
* commit '17bd9a22ec993fc9eba060950bc5cecd1e06ffb1':
  More performance work:
 2011-11-03 05:32:46 +00:00
Dianne Hackborn
17bd9a22ec Merge "More performance work:" into ics-mr1 2011-11-02 22:31:19 -07:00
Dianne Hackborn
28695e0c70 More performance work: 
- ActivityManager now keeps track of previous app as you
  move across the home app.
- Better debug info about why an activity is being destroyed.
- New performance tests.

Change-Id: I3a5ae7cb1b9f1624c6792a4f6184353f532b8f3b
 2011-11-02 22:08:41 -07:00
satok
9b3855b752 Turn off the spell checker when the spell checker is disabled in the settings 
Bug: 5554116
Change-Id: I9816101661e12cafdb9556c7e0bad39833f7dc67
 2011-11-03 13:39:34 +09:00
The Android Automerger
287c1e66fe Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0" 
This reverts commit 7f00c22b7fa7b38b644585c0a3c6faadc5def94c, reversing
changes made to 451fa13e82ea1226895b41282fdb33bf9fea5d19.
 2011-11-02 21:08:38 -07:00
The Android Automerger
b6b117624b Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0" 
This reverts commit f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3, reversing
changes made to bd9b1528051a1b257768fdbc5077a2d4473b02dd.
 2011-11-02 21:04:32 -07:00
The Android Automerger
f17756f8e6 Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0" 
This reverts commit 4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing
changes made to af675222f6340a8a9edbe9e8635014a18521e5e0.
 2011-11-02 20:59:04 -07:00
The Android Automerger
54b212c75e Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0" 
This reverts commit af675222f6340a8a9edbe9e8635014a18521e5e0, reversing
changes made to 6e91e5b689a3eb8e6a6f3c038322b8044a9d6670.
 2011-11-02 20:58:26 -07:00
The Android Automerger
50b193c82d Revert "Merge "Improve the slow query instrumentation." into ics-mr0" 
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
 2011-11-02 20:58:00 -07:00
The Android Automerger
f15af4b088 merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 20:53:06 -07:00
Joe Onorato
d488cb6136 Merge "Make ActivityManagerService just kill apps when they crash on tungsten." into ics-aah 2011-11-02 20:52:09 -07:00
Joe Onorato
e332aa1431 Make ActivityManagerService just kill apps when they crash on tungsten. 
Change-Id: I62e6a7b5e0a9b19e4906219292eb0ac9b9774141
 2011-11-02 20:50:08 -07:00
Daniel Sandler
e5f2cfeb22 Bring back Android Dreams. 
Also fix bugs related to loading changes in dreams settings.

Bug: 5121105
Change-Id: I1527c3100d5219a678dd94ed5393bc478b1a1622
 2011-11-02 23:33:27 -04:00
Eric Laurent
be5fc40fe7 Remove unreliable effect tests. 
Remove automated tests checking that audio effects are actually processing
the signal based on visualizer captures.
This method is too unreliable when used to measure energy at given frequencies and
often gives false negatives.

Issue 5542879.

Change-Id: Ib31158fd84ff9edc85712ec03c0c9957370c8f84
 2011-11-02 18:02:05 -07:00
Eric Fischer
ff6137f58d am c37f98ea: am 8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit 'c37f98eab3d6e63f71b1600ea0e4355c6503384b':
  Import revised translations.  DO NOT MERGE
 2011-11-03 00:07:21 +00:00
Katie McCormick
aa40dc08c4 am f2158d08: am e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0 
* commit 'f2158d0820ca6c243fd807224c7e8ebb96cd8d2b':
  Doc change: Update instructions to match ICS UI
 2011-11-03 00:07:19 +00:00
Katie McCormick
26d3335293 am 31a05f33: Doc change: Update instructions to match ICS UI 
* commit '31a05f336ac99ab4ecfb5e227aca40f8fc7140cb':
  Doc change: Update instructions to match ICS UI
 2011-11-03 00:07:18 +00:00
Eric Fischer
c37f98eab3 am 8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '8c49b81b5971c3fd254c4ecd862d1a32b1917edb':
  Import revised translations.  DO NOT MERGE
 2011-11-03 00:04:10 +00:00
Katie McCormick
f2158d0820 am e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0 
* commit 'e08be659eba742d117d24f642a95ba65e13bd015':
  Doc change: Update instructions to match ICS UI
 2011-11-03 00:04:09 +00:00
Eric Fischer
8c49b81b59 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-11-02 16:17:03 -07:00
Joe Onorato
407dc3ce13 Merge changes Id270a8cf,I439bba75 into ics-aah 
* changes:
  The API doesn't need a container here, all it needs is a Context.
  Parcelables are flattenable for now.
 2011-11-02 16:09:38 -07:00
Katie McCormick
31a05f336a Doc change: Update instructions to match ICS UI 
Change-Id: I565ef27401d169ff28b21f1679e56a725c1ac470
 2011-11-02 23:00:59 +00:00
Teng-Hui Zhu
1f54673381 Create GL texture when it is missing for video layer 
In any case that the HTMLVideoView is recreated with no GL texture, we should
recreate the GL texture to make sure we always have a valid texture ID.

bug:5530006
Change-Id: I703a987a7530dbeef74e502f3c9ff329beca8c4e
 2011-11-02 15:59:25 -07:00
Adam Powell
9dc8a42638 am b41d9f8a: Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1 
* commit 'b41d9f8a84a325241440b6e950dea6d240134823':
  Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled
 2011-11-02 22:45:57 +00:00
Joe Onorato
35573c0fa0 Merge "Add clear-data command to am to wipe the given package's data." into ics-aah 2011-11-02 15:45:24 -07:00
Adam Powell
b41d9f8a84 Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1 2011-11-02 15:44:31 -07:00
Katie McCormick
e08be659eb Merge "Doc change: Update instructions to match ICS UI" into ics-mr0 2011-11-02 15:42:18 -07:00
Flavio Lerda
52c01c22a5 Add a query parameter to look-up a SIP address. 
Currently there is an API to look-up a phone number in the contacts
database but not one to look up a SIP address.

This change adds a query parameter that can be added to the existing
filter URI to search the contacts with SIP addresses.

Bug: 5529690
Change-Id: I71aaf46c7528e7e6eb4160a664f4bdeacfb0581d
 2011-11-02 22:42:04 +00:00
Eric Fischer
2237e1e7b6 Import revised translations. DO NOT MERGE 
Change-Id: I2f073cc6d62d757ba4e6565a0c7974ca9cecba4c
 2011-11-02 15:14:43 -07:00
Jeff Sharkey
163e6443f2 Correct proc file reader, optimizations. 
Moved away from BufferedReader, which only reads the first 8KB of
some proc files because it aggresively fills its buffer.  Optimized
proc parsing, now double the speed.  Tests to cover.

Log when NetworkStats counters roll backwards when subtracting, and
optimizations around findIndex().  When system removes UID, also
remove from last stats snapshot to avoid xt counters from rolling
backwards.

Bug: 5472949, 5458380
Change-Id: I07c08fe5233156fac2b84450f6291868bf9bfaf2
 2011-11-02 15:14:11 -07:00
Irfan Sheriff
c5a4318b73 am b419abca: am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0 
* commit 'b419abcadad79cd908acfe51dc6e8902c16ff728':
  Avoid duplicate dialogs leading to NPE
 2011-11-02 21:41:00 +00:00
Irfan Sheriff
b419abcada am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0 
* commit '7f00c22b7fa7b38b644585c0a3c6faadc5def94c':
  Avoid duplicate dialogs leading to NPE
 2011-11-02 21:38:55 +00:00
Irfan Sheriff
7f00c22b7f Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0 2011-11-02 14:37:19 -07:00
Adam Powell
2db4e4bd1b Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary 
stopped if "defer start" is enabled

Only revise the target state in moveToState if it would cross the
stopped/started boundary.

Change-Id: I8f6e400331157eac9343261117cf633611fc1e4d
 2011-11-02 14:30:47 -07:00
Robert Greenwalt
7e7fe83cd0 am 4a113251: am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0 
* commit '4a113251078ad028d1a071ebf5562185275c7039':
  Ignore errors when untethering
 2011-11-02 21:30:30 +00:00
Robert Greenwalt
4a11325107 am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0 
* commit '451fa13e82ea1226895b41282fdb33bf9fea5d19':
  Ignore errors when untethering
 2011-11-02 21:28:33 +00:00
Robert Greenwalt
451fa13e82 Merge "Ignore errors when untethering" into ics-mr0 2011-11-02 14:26:45 -07:00
Katie McCormick
0d842cc918 Doc change: Update instructions to match ICS UI 
Change-Id: I565ef27401d169ff28b21f1679e56a725c1ac470
 2011-11-02 14:07:52 -07:00
Robert Greenwalt
731026c2df Ignore errors when untethering 
Sometimes the interface is removed before we can untether leading to
errors when cleanup up various rules (iptables).  Do as much as we can
and then let a re-tether result in error if needed.

bug:5536516
Change-Id: Ib1d064ecc8e9022566f9b0e4678b33144906971c
 2011-11-02 13:53:28 -07:00
Narayan Kamath
748af66ca2 Add an API for querying / enabling network TTS support. 
bug:5284966
Change-Id: I01708f40bf0e975449125320dbcd4842210ca168
 2011-11-02 19:37:52 +00:00
Scott Main
13462bcbd9 am 42774dec: am aea8d850: docs: a couple typos bugs 5552478 5553096 
* commit '42774decd903d0bbd1c57c9aa829719f2a683231':
  docs: a couple typos bugs 5552478 5553096
 2011-11-02 19:12:04 +00:00
Scott Main
42774decd9 am aea8d850: docs: a couple typos bugs 5552478 5553096 
* commit 'aea8d8500395f7e7dce3f670933f7aaf02be7b11':
  docs: a couple typos bugs 5552478 5553096
 2011-11-02 19:10:21 +00:00