20705 Commits

Author SHA1 Message Date
Brett Chabot
f611861735 Merge "Remove FrameworkTest package." into froyo 2010-04-01 14:36:36 -07:00
Fred Quintana
2aa2f78ec5 am e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo
Merge commit 'e8b1971c7b09f14f2d9a2e12399294798cf2066a' into froyo-plus-aosp

* commit 'e8b1971c7b09f14f2d9a2e12399294798cf2066a':
  allow null authtokens to invalidateAuthToken
2010-04-01 14:32:51 -07:00
Fred Quintana
e8b1971c7b Merge "allow null authtokens to invalidateAuthToken" into froyo 2010-04-01 14:27:00 -07:00
Fred Quintana
f35b68f2b9 allow null authtokens to invalidateAuthToken
Change-Id: I78e91ef2f43503e13386894851f0d781583a4943
http://b/issue?id=2561519
2010-04-01 14:26:32 -07:00
Derek Sollenberger
4c93207940 am 11fb6144: Match RFC requirement that the domain portion of a cookie should be case-insensitive.
Merge commit '11fb6144604fbd1148695421e9ab6896701a431b' into froyo-plus-aosp

* commit '11fb6144604fbd1148695421e9ab6896701a431b':
  Match RFC requirement that the domain portion of a cookie should be case-insensitive.
2010-04-01 12:06:25 -07:00
Brett Chabot
bd4288f418 Remove FrameworkTest package.
The only remaining test here was RingtonePickerActivityTes, which has been
suppressed since pre-donut.

Change-Id: I74c08c9c9447b67252430db3b462373af879bd1d
2010-04-01 12:05:26 -07:00
Derek Sollenberger
11fb614460 Match RFC requirement that the domain portion of a cookie should be case-insensitive.
fixes bug #2549818.

Change-Id: I1372171568828545e78690f1ddc0ddcf25ddd428
2010-04-01 14:53:06 -04:00
Fred Quintana
d316258285 revert the stripping of System Group:
from the names of google system groups

Change-Id: I677a7abb42a0c3d70d7e7009325f76a4644f1cb1
http://b/issue?id=2558197
2010-04-01 11:43:57 -07:00
Andreas Huber
eea1eefead Support another kind of iso mpeg4 file.
Change-Id: I052aa1c971c577e50679b6a9263acd32895906c7
related-to-bug: 2558114
2010-04-01 11:42:50 -07:00
Dirk Dougherty
865bd884e8 am 2d8234b7: Merge "doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo
Merge commit '2d8234b73d11fdc2178232cabad3ffaa23723405' into froyo-plus-aosp

* commit '2d8234b73d11fdc2178232cabad3ffaa23723405':
  doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
2010-04-01 10:40:15 -07:00
James Dong
d12d6c305c am ccc17b34: Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
Merge commit 'ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4' into froyo-plus-aosp

* commit 'ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4':
  Public API changes for CameraProfile and CamcorderProfile classes
2010-04-01 10:40:11 -07:00
Gilles Debunne
13c9a1f490 Refactor in PositionTesterContextMenuListener.
The asserts were removed from that class and replaced by a status String object.

This allows ExpandableListTester to do the asserts instead.
These tests passed on a sapphire and passion devices as well as in the emulator.
The asserts in the main thread are expected to make these tests pass during the
continuous build too.

This is 7fbddb1db1beeac7c6762fb7a11612e348f6ff90 cherrypicked to froyo.

http://b/issue?id=2525846
2010-04-01 10:37:53 -07:00
Dirk Dougherty
2d8234b73d Merge "doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo 2010-04-01 10:35:21 -07:00
James Dong
ccc17b34fe Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo 2010-04-01 10:33:45 -07:00
Robert Greenwalt
cab133a7fa am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
Merge commit '33eb7767fb49482643df80c8b5567da83aa0e49f' into froyo-plus-aosp

* commit '33eb7767fb49482643df80c8b5567da83aa0e49f':
  NetworkManagementService: Add interface counters & throttle API
2010-04-01 10:22:51 -07:00
Robert Greenwalt
33eb7767fb Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 2010-04-01 10:19:57 -07:00
Kristian Monsen
4ba57a4e0a am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo
Merge commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a' into froyo-plus-aosp

* commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a':
  Fix for bug 2558156: Encodig is null
2010-04-01 09:57:12 -07:00
Kristian Monsen
70c22a48e6 Merge "Fix for bug 2558156: Encodig is null" into froyo 2010-04-01 09:54:47 -07:00
Dave Sparks
5100df844c am 49e5a4c5: Update AMR codec.
Merge commit '49e5a4c5be2e8ba114efff8d0634a34867cb2c26' into froyo-plus-aosp

* commit '49e5a4c5be2e8ba114efff8d0634a34867cb2c26':
  Update AMR codec.
2010-04-01 09:47:58 -07:00
Kristian Monsen
d08127fff1 Fix for bug 2558156: Encodig is null
This does not actually pass the test since the test has wrong expectations, but it is at least doing the right thing.

Change-Id: I7da29a3f101647bb628805514cf2bdef24864e50
2010-04-01 17:38:07 +01:00
Dirk Dougherty
3d5f648f8f doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
Change-Id: I1d2b80b8dc3f8b2e3c1befcbb7c4c522d78a2db8
2010-04-01 09:16:08 -07:00
Dave Sparks
49e5a4c5be Update AMR codec.
Change-Id: I8ecd2712863f6962b762f26898002912d1c77afb
2010-04-01 09:16:05 -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
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
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
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
Eric Laurent
3fe1708d9d Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo 2010-03-31 23:33:52 -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
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
Jaikumar Ganesh
3a0d1d11eb Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo 2010-03-31 18:36:35 -07:00
Adam Powell
a0d645cb69 Fix bug 2562240 and clean up scrollbar behavior
Change-Id: I551803a1c997c9d10e1d004ce14472af6090f432
2010-03-31 17:27:49 -07:00