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

61061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
satok
d548ef3b80 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:13:13 +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
4d81191dd3 am 808ee95d: Merge "Correct proc file reader, optimizations." into ics-mr1 
* commit '808ee95dd4244da6ae767d3ddd003ed7b48937d0':
  Correct proc file reader, optimizations.
 2011-11-03 07:36:03 +00:00
Jeff Sharkey
808ee95dd4 Merge "Correct proc file reader, optimizations." into ics-mr1 2011-11-03 00:32:22 -07:00
Dianne Hackborn
92049f1d3e am 17bd9a22: Merge "More performance work:" into ics-mr1 
* commit '17bd9a22ec993fc9eba060950bc5cecd1e06ffb1':
  More performance work:
 2011-11-03 05:35:21 +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
Eric Fischer
30cddfe5e1 am c37f98ea: (-s ours) 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:43:11 +00:00
Katie McCormick
ceac0ecd12 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:43:09 +00:00
Katie McCormick
4473097193 am 31a05f33: Doc change: Update instructions to match ICS UI 
* commit '31a05f336ac99ab4ecfb5e227aca40f8fc7140cb':
  Doc change: Update instructions to match ICS UI
 2011-11-03 00:43:08 +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
Katie McCormick
31a05f336a Doc change: Update instructions to match ICS UI 
Change-Id: I565ef27401d169ff28b21f1679e56a725c1ac470
 2011-11-02 23:00:59 +00:00
Adam Powell
e40b7136bf 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:47:42 +00: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
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
05c6756b5e 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:42:49 +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
Robert Greenwalt
45ded48621 am 4a113251: am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0 
* commit '4a113251078ad028d1a071ebf5562185275c7039':
  Ignore errors when untethering
 2011-11-02 21:32:26 +00: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
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
Eric Fischer
3138e21935 Merge "Import revised translations." 2011-11-02 14:16:29 -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
Tor Norbye
333dd79622 Merge "Set theme-tag in render log when failing to find style" 2011-11-02 12:48:25 -07:00
Scott Main
2111927036 am 42774dec: am aea8d850: docs: a couple typos bugs 5552478 5553096 
* commit '42774decd903d0bbd1c57c9aa829719f2a683231':
  docs: a couple typos bugs 5552478 5553096
 2011-11-02 19:14:48 +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
Scott Main
aea8d85003 docs: a couple typos 
bugs 5552478 5553096

Change-Id: Ibeafacd446edf99096e125f5dfaa7c13a6ab1776
 2011-11-02 12:05:51 -07:00
Svetoslav Ganov
7899c51f96 am 1997fe14: Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1 
* commit '1997fe1482ecf1ca920c7729a1ad9df5340565f3':
  Update KeyBoardView to reflect the interaction model in Latin IME
 2011-11-02 18:55:44 +00:00
Svetoslav Ganov
1997fe1482 Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1 2011-11-02 11:51:58 -07:00
Peter Ng
9f360fde26 am 779c1b85: Merge "Make the notification panel header opaque." into ics-mr1 
* commit '779c1b8507d939bd3bd6d3e758ded095d91bcd6f':
  Make the notification panel header opaque.
 2011-11-02 18:50:06 +00:00
Peter Ng
dc36d92964 am c7dbfc64: Merge "making slide unlock on tablet have a larger radius" into ics-mr1 
* commit 'c7dbfc640bcbc6a238068742aeaa76473e56037e':
  making slide unlock on tablet have a larger radius
 2011-11-02 18:50:03 +00:00
Amith Yamasani
c76e566988 am dab15d14: Merge "Don\'t expand the SearchView if already expanded." into ics-mr1 
* commit 'dab15d14ca2ce9c3a614e97869824c6337e76d51':
  Don't expand the SearchView if already expanded.
 2011-11-02 18:47:51 +00:00
Peter Ng
779c1b8507 Merge "Make the notification panel header opaque." into ics-mr1 2011-11-02 11:47:04 -07:00
Peter Ng
c7dbfc640b Merge "making slide unlock on tablet have a larger radius" into ics-mr1 2011-11-02 11:46:32 -07:00
Amith Yamasani
dab15d14ca Merge "Don't expand the SearchView if already expanded." into ics-mr1 2011-11-02 11:43:53 -07:00
The Android Open Source Project
c89d527996 am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release 
* commit '11b49ba933bab7ff8262139141eef0e5f3c45a18':
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
  Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
  Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
 2011-11-02 17:59:05 +00:00
Adam Powell
8d317b5be8 am 7a5a50c1: Merge "Bug 5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1 
* commit '7a5a50c12f6a6e094d1e8aa7514df37f1176354a':
  Bug 5513073 - IllegalArgumentException: View not attached to window manager
 2011-11-02 17:54:36 +00:00
The Android Open Source Project
11b49ba933 Reconcile with ics-mr0-release ics-factoryrom-2-release 
Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001
 2011-11-02 10:52:49 -07:00
Svetoslav Ganov
d10b004116 am e5d0f199: Merge "CalendarView title incorrectly updated for different languages." into ics-mr1 
* commit 'e5d0f19953189fdd0e2661ebb7f0ea925f14ea13':
  CalendarView title incorrectly updated for different languages.
 2011-11-02 17:50:50 +00:00
Svetoslav Ganov
4b6de4f5a9 am 6e42470f: Merge "Accessibility window query APIs should respect root name space." into ics-mr1 
* commit '6e42470f928bbf60c9fd3d17a2a69a4b96cec170':
  Accessibility window query APIs should respect root name space.
 2011-11-02 17:50:48 +00:00
Svetoslav Ganov
9c25727306 am 7f0c850b: Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1 
* commit '7f0c850b7a4a2b8a135a110a33d053f4d6689559':
  Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes.
 2011-11-02 17:50:46 +00:00
Irfan Sheriff
339590d97e am f9d8faf7: am 953005e8: Merge "Specify component name for provisioning" into ics-mr0 
* commit 'f9d8faf7fe9d23bddf4d8d039805bce806e9b9c6':
  Specify component name for provisioning
 2011-11-02 17:50:27 +00:00
Jeff Sharkey
1a9fedf497 am 9427d688: am db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0 
* commit '9427d688bda2d5b177112a58dcfdbcdfdfe98559':
  Process AMS events in NetworkPolicy handler.
 2011-11-02 17:50:25 +00:00
Dianne Hackborn
8f3818c71c am 39cec406: Merge "Add new OOM adjustment for the "previous" process." into ics-mr1 
* commit '39cec40697ab3d1d106e0c0c21458b2085c96f00':
  Add new OOM adjustment for the "previous" process.
 2011-11-02 17:50:23 +00:00