GitLab

Change-Id: Id3a0c06202b0f6f2206acf490c8655d340ee0556

Change-Id: I3ad6925b8a9f0ee14e4180e798519c23b6bf6662

Change-Id: I6def51dea7aab002f7dbbe1e2573f52a2caa94fe

am 3e8b89bd: am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo

Merge commit '3e8b89bd' into kraken

* commit '3e8b89bd':
  Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.

am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo

Merge commit '2be77a22' into froyo-plus-aosp

* commit '2be77a22':
  Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.

Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo

am 266bb3c5: am f1b256f5: Merge "Fix last character of password field being visible after rotation" into froyo

Merge commit '266bb3c5' into kraken

* commit '266bb3c5':
  Fix last character of password field being visible after rotation

Merge commit 'f1b256f5' into froyo-plus-aosp

* commit 'f1b256f5':
  Fix last character of password field being visible after rotation

Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.

Change-Id: I14e9fbc1fdff61bcf89218d83cb1d2e3d6eb8438
related-to-bug: 2574491

am 140d040b: am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo

Merge commit '140d040b' into kraken

* commit '140d040b':
  Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again

am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo

Merge commit 'd8b9b511' into froyo-plus-aosp

* commit 'd8b9b511':
  Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again

Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo

This is a fix for http://code.google.com/p/android/issues/detail?id=907. Note that
that issue was declined without comment, but the bug (while incredibly minor)
does exist. This can be seen on the facebook app, as well as many third party apps.

Change-Id: I8f1449c47228f5f757a5baf389656e51c817b150

Merge commit 'ccb2c6cf' into kraken

* commit 'ccb2c6cf':
  Fix 'bmgr restore'

Merge commit '8dbf5105' into kraken

* commit '8dbf5105':
  Update the Webkit version.

am 92b46ffb: am bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo

Merge commit '92b46ffb' into kraken

* commit '92b46ffb':
  Correctly resize dialogs when measured in WRAP_CONTENT

am 710312b3: am 48bce451: Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo

Merge commit '710312b3' into kraken

* commit '710312b3':
  Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B

Merge commit '1bfcaa59' into froyo-plus-aosp

* commit '1bfcaa59':
  Fix 'bmgr restore'

Merge commit '54fccf8a' into froyo-plus-aosp

* commit '54fccf8a':
  Update the Webkit version.

Merge commit 'bd4808dc' into froyo-plus-aosp

* commit 'bd4808dc':
  Correctly resize dialogs when measured in WRAP_CONTENT

am 48bce451: Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo

Merge commit '48bce451' into froyo-plus-aosp

* commit '48bce451':
  Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B

Zero means success.  Fixes bug #2573785

Change-Id: I11bd4d85aa2b3a061aa37e085790ee8cd52d50a2

Fix http://b/issue?id=2571957

This is a quick and dirty solution to re-assign permissions after booting
from a platform update.  It is not great, because it means that an app
can have permissions that the user didn't get to see when they originally
installed it.  Unfortunately it's not clear what else to do here, nor is
there time to do anything significant.

Change-Id: I82faba141b5883c87212afa7febecf9860a413e3

Bug #2549649

If the window had a different size than its content but the content had already
been measured with the appropriate size, the window would not be resized. This
happens in wrap_content windows (dialogs.) This change simply adds a new codition
to window resizing: if the window is wrap_content, not as big as it can be and
not as big as its content, it gets resized.

Change-Id: I1d82d03af5a15c9ad8dffa0511d5f6d522578285

Merge commit 'e6fdab7f' into kraken

* commit 'e6fdab7f':
  Forcibly unmount the sdcard after N retries.

Merge commit 'fede9aed' into froyo-plus-aosp

* commit 'fede9aed':
  Forcibly unmount the sdcard after N retries.

Merge commit '7eeb44f2' into kraken

* commit '7eeb44f2':
  Disable tethering when airplane mode is enabled

Merge commit 'b2e6c01f' into froyo-plus-aosp

* commit 'b2e6c01f':
  Disable tethering when airplane mode is enabled

Bug:2572239

Change-Id: I5fedd6cac64d495ba208ddcb45a7d09a05bb9a65

Tethering should be disabled when
airplane mode is enabled. Additionally,
we should restore Wifi (if it was on
before tethering was enabled) when
airplane mode is disabled.

Bug: 2567099
Change-Id: Iba2031f5ecb207954fd155c47134b39ed0167fa0

Don't rely on the ActivityManager's reported status about killing the
storage user process since the process might have gone away in between.

Change-Id: Ia7fa43eb34553329e7ff611ab6b99375b5ae673a

Merge commit '16419aca' into kraken

* commit '16419aca':
  Guard against NPE in SearchManagerService

Merge commit '7d2511b7' into froyo-plus-aosp

* commit '7d2511b7':
  Guard against NPE in SearchManagerService