Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,373 Commits 3 Branches 0 Tags
ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d
Commit Graph

9415 Commits

Author SHA1 Message Date
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
d3bafad896 am 4c932079: am 11fb6144: Match RFC requirement that the domain portion of a cookie should be case-insensitive. 
Merge commit '4c93207940aa70b3f777fe14dce1bf580e1b71ba' into kraken

* commit '4c93207940aa70b3f777fe14dce1bf580e1b71ba':
  Match RFC requirement that the domain portion of a cookie should be case-insensitive.
 2010-04-01 12:10:03 -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
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
Dirk Dougherty
7fb51bf546 am 865bd884: am 2d8234b7: Merge "doc change: cherry pick 75c66da209. (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 '865bd884e878bbc6d9f5832fda6971c21754b588' into kraken

* commit '865bd884e878bbc6d9f5832fda6971c21754b588':
  doc change: cherry pick 75c66da209. (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:47:00 -07:00
Dirk Dougherty
865bd884e8 am 2d8234b7: Merge "doc change: cherry pick 75c66da209. (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 75c66da209. (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
Dirk Dougherty
2d8234b73d Merge "doc change: cherry pick 75c66da209. (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
Robert Greenwalt
4e925f8afb am cab133a7: am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 
Merge commit 'cab133a7fa39969f136e3f401f97f6ce843514bb' into kraken

* commit 'cab133a7fa39969f136e3f401f97f6ce843514bb':
  NetworkManagementService: Add interface counters & throttle API
 2010-04-01 10:27:04 -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
86a09e4d76 am 4ba57a4e: am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo 
Merge commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578' into kraken

* commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578':
  Fix for bug 2558156: Encodig is null
 2010-04-01 10:00:08 -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
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 75c66da209. (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
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
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
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
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
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
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
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
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
Adam Powell
40cd1cf6aa Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo 2010-03-31 20:11:33 -07:00
Adam Powell
a0d645cb69 Fix bug 2562240 and clean up scrollbar behavior 
Change-Id: I551803a1c997c9d10e1d004ce14472af6090f432
 2010-03-31 17:27:49 -07:00
Dianne Hackborn
9c9c532d36 Fix issue #2560791: Expose API to go in to car mode. 
Also fix bug where night mode was being used in desk dock.

Change-Id: I56c1cf3d6fe800a4f986d40cc4cb2e70b76ac261
 2010-03-31 16:25:53 -07:00
The Android Open Source Project
4790259c32 am 8de2cf4c: merge from open-source master 
Merge commit '8de2cf4cce9ae2e121fccb4732fd23c64aace102' into kraken

* commit '8de2cf4cce9ae2e121fccb4732fd23c64aace102':
  Fix last character of password field being visible after rotation
  gl_code : add end of line.
 2010-03-31 14:17:32 -07:00
The Android Open Source Project
8de2cf4cce merge from open-source master 
Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4
 2010-03-31 14:01:45 -07:00
Patrick Scott
e4424326ce am 09c49a8a: am 92534469: Use case insensitive matching. 
Merge commit '09c49a8a6c3670126b2b9c477c5ac19cebdb9510' into kraken

* commit '09c49a8a6c3670126b2b9c477c5ac19cebdb9510':
  Use case insensitive matching.
 2010-03-31 11:04:50 -07:00
Patrick Scott
09c49a8a6c am 92534469: Use case insensitive matching. 
Merge commit '9253446922d925f6a5453b60d539beed292921a7' into froyo-plus-aosp

* commit '9253446922d925f6a5453b60d539beed292921a7':
  Use case insensitive matching.
 2010-03-31 11:00:39 -07:00
San Mehat
6f63dd5dc8 framework: Hide StorageManager for froyo - do not merge 
Change-Id: I9a871e49cc9e1accb28c7e4b76bb0796eaf26d7b
 2010-03-31 10:46:42 -07:00
Patrick Scott
9253446922 Use case insensitive matching. 
Use the lowercase version of the protocol.

Bug: 2560217
Change-Id: Ibfadf4ba363968df9caf22c9ab36f666ee44d1db
 2010-03-31 13:36:47 -04:00
Robert Greenwalt
f91120905a am 676f7052: am 0a08b194: Merge "Fix HttpProxy." into froyo 
Merge commit '676f70527d9f576f6e8b9e47e0aa7ac145fa81c2' into kraken

* commit '676f70527d9f576f6e8b9e47e0aa7ac145fa81c2':
  Fix HttpProxy.
 2010-03-31 08:37:45 -07:00
Robert Greenwalt
676f70527d am 0a08b194: Merge "Fix HttpProxy." into froyo 
Merge commit '0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d' into froyo-plus-aosp

* commit '0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d':
  Fix HttpProxy.
 2010-03-31 08:35:16 -07:00
Robert Greenwalt
0a08b1948f Merge "Fix HttpProxy." into froyo 2010-03-31 08:32:03 -07:00
Bjorn Bringert
3a694c045f am 86f6f536: am 11a7ba36: Support for apps search in apps provider contract 
Merge commit '86f6f536e04a6f90fddc2695282ffb3842dcbb68' into kraken

* commit '86f6f536e04a6f90fddc2695282ffb3842dcbb68':
  Support for apps search in apps provider contract
 2010-03-31 07:26:12 -07:00
Bjorn Bringert
86f6f536e0 am 11a7ba36: Support for apps search in apps provider contract 
Merge commit '11a7ba367f39175f41300f384ec6e984bcc08d53' into froyo-plus-aosp

* commit '11a7ba367f39175f41300f384ec6e984bcc08d53':
  Support for apps search in apps provider contract
 2010-03-31 07:21:13 -07:00