Commit Graph

6147 Commits

Author SHA1 Message Date
Robert Greenwalt
e8df648807 am 2d9ccdb4: am b445362b: Make upstream tether list threadsafe
* commit '2d9ccdb4abd393375c5ae99445afbb8b0855d25c':
  Make upstream tether list threadsafe
2011-11-07 23:38:39 +00:00
Robert Greenwalt
2d9ccdb4ab am b445362b: Make upstream tether list threadsafe
* commit 'b445362bd67cf596cfdd39db2dbe8f42cf9a119a':
  Make upstream tether list threadsafe
2011-11-07 23:36:28 +00:00
Robert Greenwalt
b445362bd6 Make upstream tether list threadsafe
Outsiders asking for this list may cause the list to change on another thread.
Fixing general synchronization issues.

bug:5531630
Change-Id: I7a3ee0bba3db40f45bcb0159491942fa4cf38c37
2011-11-07 14:44:48 -08:00
Daniel Sandler
795f1bf4c4 am 010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1
* commit '010bb273a58444f907bb82f62f8d7274f9637b49':
  Offer the user an option to launch Dreams when docked.
  Teach UiModeMgr about high-end and low-end desk docks.
2011-11-07 18:13:20 +00:00
Daniel Sandler
010bb273a5 Merge changes I0da0f04f,I93197665 into ics-mr1
* changes:
  Offer the user an option to launch Dreams when docked.
  Teach UiModeMgr about high-end and low-end desk docks.
2011-11-07 10:11:52 -08:00
Dianne Hackborn
23d1092a75 am 6581043a: am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
* commit '6581043a44ab46a47f09080eeb7c9fc9d0a2d0c0':
  Print out memory info when we get into a low memory situation.
2011-11-05 07:36:22 +00:00
Dianne Hackborn
6581043a44 am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
* commit '7311bd4b709750384b058d8e988e2e983c97b3f2':
  Print out memory info when we get into a low memory situation.
2011-11-05 07:34:03 +00:00
Dianne Hackborn
7311bd4b70 Merge "Print out memory info when we get into a low memory situation." into ics-mr0 2011-11-05 00:31:17 -07:00
Dianne Hackborn
04d6db380f Print out memory info when we get into a low memory situation.
Change-Id: I2c8b8847a0f38135d8bf9ff9b7198517c3b0262e
2011-11-04 20:07:24 -07:00
Mathias Agopian
308b327fb6 am 3f24589e: Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1
* commit '3f24589edd860618ccf65d6653b002d13810e78b':
  workaround to set the WM refresh rate to 48 Hz for tuna devices only
2011-11-05 03:00:13 +00:00
Mathias Agopian
222357f33a workaround to set the WM refresh rate to 48 Hz for tuna devices only
this is TEMPORARY until we can do this properly.

Bug: 5572464
Change-Id: I6537706d636a83a4a50e2900d6b829dd89b6f245
2011-11-04 18:46:11 -07:00
Robert Greenwalt
796ef0d0e1 am fd900f05: am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
* commit 'fd900f05fb67046b97701f20626f7fd408fd8990':
  Start using IP tool for advanced routing.
2011-11-04 22:57:48 +00:00
Robert Greenwalt
fd900f05fb am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
* commit '348297abc0e03fb87a1d22465020b580d83fdd61':
  Start using IP tool for advanced routing.
2011-11-04 22:55:30 +00:00
Robert Greenwalt
348297abc0 Merge "Start using IP tool for advanced routing." into ics-mr0 2011-11-04 15:53:37 -07:00
Dave Burke
a243a6befe am a3af4c94: am 3ee47188: Frame rate to 48 fps
* commit 'a3af4c94dfbf3336004a38011f6453bfcd7fd638':
  Frame rate to 48 fps
2011-11-04 20:58:48 +00:00
Dave Burke
a3af4c94df am 3ee47188: Frame rate to 48 fps
* commit '3ee471889b09d90affddd00c409a515a64b6861b':
  Frame rate to 48 fps
2011-11-04 20:55:30 +00:00
Dave Burke
3ee471889b Frame rate to 48 fps
Change-Id: I95645b3921db22dfeca97ad2743299ccda5de83b
2011-11-04 13:08:15 -07:00
Daniel Sandler
69a1da4dde Teach UiModeMgr about high-end and low-end desk docks.
Should fix dock mode on Stingray, since its docks advertise
themselves as EXTRA_DOCK_STATE_LE_DESK and
EXTRA_DOCK_STATE_HE_DESK but not EXTRA_DOCK_STATE_DESK.

Bug: 5569662
Change-Id: I93197665c0df8dea06ca8fadae97ec267c751c85
2011-11-04 15:15:40 -04:00
Irfan Sheriff
c4eeed7312 am 45a04db3: Merge "Avoid quick shutdown after a driver start" into ics-mr1
* commit '45a04db3f95755829b24043d30d7da7182b4f33b':
  Avoid quick shutdown after a  driver start
2011-11-04 18:49:39 +00:00
Irfan Sheriff
45a04db3f9 Merge "Avoid quick shutdown after a driver start" into ics-mr1 2011-11-04 11:47:27 -07:00
Robert Greenwalt
3b28e9a3da Start using IP tool for advanced routing.
bug:5495862
bug:5396842
Change-Id: I5e31b352b14a4dc746cacce4d61cf8d9ad7382a0
2011-11-04 09:52:04 -07:00
Irfan Sheriff
e6daca5f53 Avoid quick shutdown after a driver start
Causes problems on our wext driver and potentially on cfg
based driver as well.

NLP can trigger very quick acquire and release within seconds
leading to driver switching between start and stop state.

We now keep driver up for atleast couple of minutes after a start

Bug: 5478196
Change-Id: I1b261578252c5fb9a65446241b51e5686d4d9cc3
2011-11-03 15:48:43 -07:00
Jeff Sharkey
7d6931583a am 3f9ce4c2: Merge "Verify AppWidget ownership during update." into ics-mr1
* commit '3f9ce4c22ae9b4f0f2208c29f8c93d6ad652a1dc':
  Verify AppWidget ownership during update.
2011-11-03 18:47:46 +00:00
Jeff Sharkey
3f9ce4c22a Merge "Verify AppWidget ownership during update." into ics-mr1 2011-11-03 11:43:52 -07:00
Jeff Sharkey
933decaa5e Verify AppWidget ownership during update.
Bug: 5563081
Change-Id: I528ec944d404989bb21b32ef01feb3d35e23d3ad
2011-11-03 11:26:11 -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
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
Joe Onorato
e332aa1431 Make ActivityManagerService just kill apps when they crash on tungsten.
Change-Id: I62e6a7b5e0a9b19e4906219292eb0ac9b9774141
2011-11-02 20:50:08 -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
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
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
Jeff Sharkey
615ea68a4e 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 04:18:34 +00:00
Jeff Sharkey
9427d688bd am db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
* commit 'db0ab2e731d755f64583c5704fa406bc0e7a2af4':
  Process AMS events in NetworkPolicy handler.
2011-11-02 04:16:13 +00:00
Dianne Hackborn
f30880d154 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 04:12:26 +00:00
Jeff Sharkey
6f7af03cf1 Process AMS events in NetworkPolicy handler.
When a process changes foreground status or dies, NetworkPolicy
updates its internal state with a lock held.  In cases where there
is contention, this can block the AMS handler and prevent other
events, such as broadcasts, from being dispatched.

This change moves the incoming AMS events to an existing internal
NetworkPolicy handler thread, where they can execute without
blocking AMS.

Bug: 5497544
Change-Id: Ie0c620a620fd9f0f4eb02af510bd819efa4deb6a
2011-11-01 19:37:34 -07:00
Dianne Hackborn
f35fe23669 Add new OOM adjustment for the "previous" process.
This is the process that you had previously been interacting with
in the UI before the current one.  Treating it specially should
allow us to improve the scenario of switching back and forth
between two apps.

Also add API constent for ICS MR1.

Change-Id: Ib3fe4df36b270be11dfd6b7e8d107c9994058a4d
2011-11-01 19:25:20 -07:00
Dianne Hackborn
88175571f2 am f136aa34: Merge "Various performance and other work." into ics-mr1
* commit 'f136aa341abaaf7fd6f7632d41a30b2989d93985':
  Various performance and other work.
2011-11-01 17:44:04 +00:00
Dianne Hackborn
f136aa341a Merge "Various performance and other work." into ics-mr1 2011-11-01 10:42:54 -07:00
satok
1fd0109a11 am ff93e417: Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1
* commit 'ff93e417a217703a635d8601b835853e07233afd':
  Resolve memory leak in TextServicesManagerService
2011-11-01 01:22:42 +00:00
Dianne Hackborn
2c84cfc001 Various performance and other work.
- IME service now switches between visible and perceptible depending on
  whether it is being showm, allowing us to more aggressively free its
  memory when not shown.

- The activity display time is no longer delayed by the activity
  transition animation.

- New -R (repeat) option for launching activities with the am command.

- Improved some documentation on Loader to be clear about some methods
  that apps should not normally call.

- FrameworkPerf test now allows you to select individual tests to run.

Change-Id: Id1f73de66dc93d63212183958a72119ad174318b
2011-10-31 16:52:34 -07:00
Mike Lockwood
8e043cd5a4 Fix merge problem
Change-Id: I8767e14c13760a9f3303fa31045d174ac9d73cd9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-31 10:30:29 -04:00
Ed Heyl
92537e6ff2 merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)
Change-Id: I86d1111d86cd1646ebc8a88d58aa393089e9f928
2011-10-31 06:06:27 -07:00
satok
2520ed8cc3 Resolve memory leak in TextServicesManagerService
Bug: 5499490
Change-Id: I3537b0d733a53d4783902a545cd9ecc7e4c2eac1
2011-10-31 19:38:05 +09:00
satok
f0fd595f0f Merge "Hide ime switcher when the screen is turned off." into ics-mr1 2011-10-28 18:25:28 -07:00
Dianne Hackborn
e02c88af79 Work on process management.
Introduce a new concept of "B" services.  All running services are
classified as either A or B.  B services are later in the LRU list.
Their oom_adj is after the home app.  This allows us to better pick
services to kill based on how long they have running, and should
reduce the amount that we end up killing the home app.

This temporarly turns on a debug log when the oom_adj of a process
is changed.  Sorry, I know it is noisy.  This is needed to try to
track down why some processes are being killed.

Also add a flag to the SyncManager's service binding to allow the
syncing process to be more aggressively killed if it has done UI.
This is to address cases we have seen where sync is causing an 80MB
gmail process to be kept around, preventing other process from running.
Now what will happen is that the syncing process will aggressively be
killed by the system, and can then be restarted in a much lighter-weight
state.

Do a little tweak in the power manager to allow us to still do smooth
brightness changes even when the fancy TV off animation is in use.

And get rid of a debug log in the window manager that was accidentally
left in.

Change-Id: I64a8eeaaa1f096bab29c665fbff804c7f1d029e2
2011-10-28 17:15:08 -07:00