21037 Commits

Author SHA1 Message Date
Ben Murdoch
6036fb37d4 am 2e646429: am bf691348: am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo 2010-04-01 08:53:41 -07:00
Ben Murdoch
2e646429f4 am bf691348: am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo
Merge commit 'bf6913481eff68a69d1e6ba312227e2fcea29793' into kraken

* commit 'bf6913481eff68a69d1e6ba312227e2fcea29793':
  Cherry pick from master.
  Cherry pick from master.
2010-04-01 08:47:58 -07:00
Ben Murdoch
bf6913481e am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo
Merge commit '352cf1a45e26803a466d096ca2d679ea5a3ac249' into froyo-plus-aosp

* commit '352cf1a45e26803a466d096ca2d679ea5a3ac249':
  Cherry pick from master.
  Cherry pick from master.
2010-04-01 08:44:58 -07:00
Ben Murdoch
352cf1a45e Merge changes Ic9531e3c,I3f04433b into froyo
* changes:
  Cherry pick from master.
  Cherry pick from master.
2010-04-01 08:42:14 -07:00
Steve Block
2bb2553a20 Cherry pick from master.
Fixes DumpRenderTree to re-use HTTP authentication credentials

This is required for layout test http/tests/appcache/auth.html

Bug: 2098423
Change-Id: Ic9531e3c23a2fa9ebfab70cde3172550f572a404
2010-04-01 16:39:53 +01:00
San Mehat
91cac64cd0 NetworkManagementService: Add interface counters & throttle API
Change-Id: I4976549cdbb027ba7859335e69bf866e738961c9
Signed-off-by: San Mehat <san@google.com>
2010-04-01 08:34:20 -07:00
Grace Kloba
433dc6a764 am 0aca8f9c: am fe72c533: am 461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 2010-04-01 08:26:07 -07:00
Grace Kloba
0aca8f9c6b am fe72c533: am 461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo
Merge commit 'fe72c533fe210e147111e0a862360032365dd987' into kraken

* commit 'fe72c533fe210e147111e0a862360032365dd987':
  As we don't support over scroll any more, we need
2010-04-01 08:20:48 -07:00
Steve Block
0348440e4a Cherry pick from master.
This change forwards to the WebView HTTP authentication credentials that
are supplied to an XHR from JavaScript. This allows the WebView to store these
credentials for use with later requests.

This is a re-working of https://android-git.corp.google.com/g/46430

Bug: 2544330
Change-Id: I3f04433b00233d7b7bf4f7e3471d8d15d8817f93
2010-04-01 16:19:39 +01:00
Grace Kloba
fe72c533fe am 461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo
Merge commit '461cef5d209fd072c82f6a70eb106e4690b7ef97' into froyo-plus-aosp

* commit '461cef5d209fd072c82f6a70eb106e4690b7ef97':
  As we don't support over scroll any more, we need
2010-04-01 08:17:35 -07:00
Grace Kloba
461cef5d20 Merge "As we don't support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 2010-04-01 08:15:09 -07:00
Bjorn Bringert
48d9980d0c Expose Context.STORAGE_SERVICE in master
This was recently hidden in Froyo, and the the change automerged
to Master, where it broke the SDK build since StorageManager is
exposed in Master.

Change-Id: I44f9f666c7644e1c16e3274adc6ae6cd5ac0fdd4
2010-04-01 14:33:22 +01:00
Romain Guy
f4d67ca61d Merge "Don't ignore the parameters passed to the load methods." 2010-04-01 01:02:01 -07:00
Romain Guy
43d390085d Don't ignore the parameters passed to the load methods.
Change-Id: Id2090a2a0a39dc19b821ee6a01dd206de366397e
2010-04-01 01:01:17 -07:00
James Dong
e64d9a236e Public API changes for CameraProfile and CamcorderProfile classes
1. CamcorderProfile: “@see” links are broken; Remove m prefix from fields; remove “final”
2. CamcorderProfile.Quality: use an int rather than an enum
3. Add API on MediaRecorder to pass in a CamcorderProfile
4. CameraProfile.getImageEncodingQualityLevels @hide or make it consistent with CamcorderProfile
5. Remove a convenient method and instead let the (mms) app do that task

bug - 2553862

Change-Id: I759215c7892f772aeddf3651d17038489c6fbc50
2010-04-01 00:12:20 -07:00
Eric Laurent
7605fe9276 am 673e6720: am 110c432e: am 3fe1708d: Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo 2010-03-31 23:45:27 -07:00
Eric Laurent
673e672050 am 110c432e: am 3fe1708d: Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo
Merge commit '110c432e6c90c604d955b795f91fe08c35f49e60' into kraken

* commit '110c432e6c90c604d955b795f91fe08c35f49e60':
  Fix isssue 2548710: Native AudioTrack resources never freed.
2010-03-31 23:39:41 -07:00
Eric Laurent
110c432e6c am 3fe1708d: Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo
Merge commit '3fe1708d9d204fa63e8abe6e434378d89e963752' into froyo-plus-aosp

* commit '3fe1708d9d204fa63e8abe6e434378d89e963752':
  Fix isssue 2548710: Native AudioTrack resources never freed.
2010-03-31 23:37:02 -07:00
Dianne Hackborn
a72073e945 am 3bd18537: am 6ff57ee3: am db3ea3d0: Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo 2010-03-31 23:34:24 -07:00
Dianne Hackborn
c1c1d63e05 am d0b5b3cb: am 2d8d4d7b: am 513ae361: Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo 2010-03-31 23:34:16 -07:00
Dianne Hackborn
9fa763c503 am aa3bbe9c: am 025f3933: am 686f7911: Merge "Fix issue #2561067: Screen Display half faded..." into froyo 2010-03-31 23:34:13 -07:00
Xia Wang
7eb90c3b2c am 3946101c: am c2eb4094: am de1b1872: Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo 2010-03-31 23:34:09 -07:00
Adam Powell
ffd8e0fe94 am fff52b6a: am 5af7ef60: am 40cd1cf6: Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo 2010-03-31 23:34:04 -07:00
Suchi Amalapurapu
081e7a2716 am 392be3fa: am 1aa64b53: am ae18171a: Change certificate policy. 2010-03-31 23:33:59 -07:00
Jaikumar Ganesh
2023b2359d am d4afde3d: am b8fc825d: am 3a0d1d11: Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo 2010-03-31 23:33:55 -07:00
Eric Laurent
3fe1708d9d Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo 2010-03-31 23:33:52 -07:00
Dianne Hackborn
3bd1853798 am 6ff57ee3: am db3ea3d0: Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo
Merge commit '6ff57ee310290715c000fd771cd7e18b1537ccbc' into kraken

* commit '6ff57ee310290715c000fd771cd7e18b1537ccbc':
  Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
2010-03-31 23:23:20 -07:00
Dianne Hackborn
d0b5b3cb61 am 2d8d4d7b: am 513ae361: Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo
Merge commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23' into kraken

* commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23':
  Fix issue #2560791: Expose API to go in to car mode.
2010-03-31 23:23:16 -07:00
Dianne Hackborn
aa3bbe9c9f am 025f3933: am 686f7911: Merge "Fix issue #2561067: Screen Display half faded..." into froyo
Merge commit '025f3933cfc21655bfc5a5068c69303f1fe321ee' into kraken

* commit '025f3933cfc21655bfc5a5068c69303f1fe321ee':
  Fix issue #2561067: Screen Display half faded...
2010-03-31 23:23:10 -07:00
Xia Wang
3946101cc6 am c2eb4094: am de1b1872: Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo
Merge commit 'c2eb4094d1f62cf6e4f10b0b1f64e64c70a03ea9' into kraken

* commit 'c2eb4094d1f62cf6e4f10b0b1f64e64c70a03ea9':
  Test connecitvity manager functionality in state change.
2010-03-31 23:23:06 -07:00
Adam Powell
fff52b6a3d am 5af7ef60: am 40cd1cf6: Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo
Merge commit '5af7ef60277060b94604a0b9679bb08a4dc1e731' into kraken

* commit '5af7ef60277060b94604a0b9679bb08a4dc1e731':
  Fix bug 2562240 and clean up scrollbar behavior
2010-03-31 23:23:02 -07:00
Suchi Amalapurapu
392be3fa3d am 1aa64b53: am ae18171a: Change certificate policy.
Merge commit '1aa64b53eb9b3cc7904705076a015a5cd0e3b536' into kraken

* commit '1aa64b53eb9b3cc7904705076a015a5cd0e3b536':
  Change certificate policy.
2010-03-31 23:22:56 -07:00
Jaikumar Ganesh
d4afde3d12 am b8fc825d: am 3a0d1d11: Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo
Merge commit 'b8fc825dfafd8792a4d9daead9d3d1b4a4b55de5' into kraken

* commit 'b8fc825dfafd8792a4d9daead9d3d1b4a4b55de5':
  Fix crash while turning bluetooth on, due to a race condition.
2010-03-31 23:22:51 -07:00
Dianne Hackborn
6ff57ee310 am db3ea3d0: Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo
Merge commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982' into froyo-plus-aosp

* commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982':
  Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
2010-03-31 23:18:32 -07:00
Dianne Hackborn
2d8d4d7b16 am 513ae361: Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo
Merge commit '513ae3610e5d6eac3af71c3e51a4e5e8b55b5256' into froyo-plus-aosp

* commit '513ae3610e5d6eac3af71c3e51a4e5e8b55b5256':
  Fix issue #2560791: Expose API to go in to car mode.
2010-03-31 23:18:28 -07:00
Dianne Hackborn
025f3933cf am 686f7911: Merge "Fix issue #2561067: Screen Display half faded..." into froyo
Merge commit '686f7911a3462d6847d2a9396572eaaf04a9f175' into froyo-plus-aosp

* commit '686f7911a3462d6847d2a9396572eaaf04a9f175':
  Fix issue #2561067: Screen Display half faded...
2010-03-31 23:18:24 -07:00
Xia Wang
c2eb4094d1 am de1b1872: Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo
Merge commit 'de1b1872b33495da0bcd4c29ffeb3783fa7702e9' into froyo-plus-aosp

* commit 'de1b1872b33495da0bcd4c29ffeb3783fa7702e9':
  Test connecitvity manager functionality in state change.
2010-03-31 23:18:21 -07:00
Adam Powell
5af7ef6027 am 40cd1cf6: Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo
Merge commit '40cd1cf6aab4e9ef773cd3f6b8c8107da30bd705' into froyo-plus-aosp

* commit '40cd1cf6aab4e9ef773cd3f6b8c8107da30bd705':
  Fix bug 2562240 and clean up scrollbar behavior
2010-03-31 23:18:17 -07:00
Suchi Amalapurapu
1aa64b53eb am ae18171a: Change certificate policy.
Merge commit 'ae18171acd3c70fc6d27fc6bbe85828e0f928fad' into froyo-plus-aosp

* commit 'ae18171acd3c70fc6d27fc6bbe85828e0f928fad':
  Change certificate policy.
2010-03-31 23:18:12 -07:00
Jaikumar Ganesh
b8fc825dfa am 3a0d1d11: Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo
Merge commit '3a0d1d11eba05d74d0461083eb6f31321588a0f6' into froyo-plus-aosp

* commit '3a0d1d11eba05d74d0461083eb6f31321588a0f6':
  Fix crash while turning bluetooth on, due to a race condition.
2010-03-31 23:18:05 -07:00
Grace Kloba
ad7a1d79f7 As we don't support over scroll any more, we need
to pin the (x,y) if we handle the drag after the
plugin choose not to handle the event.

Fix http://b/issue?id=2563143
2010-03-31 23:04:56 -07:00
Dianne Hackborn
db3ea3d006 Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo 2010-03-31 23:04:22 -07:00
Dianne Hackborn
513ae3610e Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo 2010-03-31 23:03:26 -07:00
Dianne Hackborn
726426ee73 Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
We need to make sure, if the window size changes, to have onSurfaceChanged()
called for the surface to be redrawn.

Change-Id: Iad518199fa400de8059a77ed34d50d6eb93a6aff
2010-03-31 22:55:26 -07:00
Dianne Hackborn
686f7911a3 Merge "Fix issue #2561067: Screen Display half faded..." into froyo 2010-03-31 22:49:30 -07:00
Dianne Hackborn
f83c555d8a Fix issue #2561067: Screen Display half faded...
Also a little tweak to the activity manager to behave better when
an application crash, to hopefully mostly avoid situations where
you get into a crash loop.

Change-Id: I627cc1da3a0f16a180957f02bfbe5c81ecd31758
2010-03-31 22:47:10 -07:00
Romain Guy
feb4fb9682 Fix the build, really
Change-Id: Id5e00cf7eb822dabb0b2b95b541855871ff0fe07
2010-03-31 21:09:19 -07:00
Xia Wang
de1b1872b3 Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo 2010-03-31 20:29:10 -07:00
Adam Powell
40cd1cf6aa Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo 2010-03-31 20:11:33 -07:00
Suchi Amalapurapu
ae18171acd Change certificate policy.
The certificates of the package and its shared user certificates
 are initialized only when installing the package.

When scanning the packages, the certificates are collected from the apk
if the time stamp changes. If not the one's from
PackageSetting(read from packages.xml) are reused.

Removed mergeSignatures and updateSignatures since we don't support
this any more.
Also fix some bugs related to reinstalling failed upgrades.

Some unit tests.

Change-Id: Ibdeff170bd386d723f774136b18e0ad59d9cdabb
2010-03-31 19:58:25 -07:00