20881 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Dirk Dougherty
1b3cd79674 am 8557df02: am 058e385b: doc change: fix link in guidelines index.
Merge commit '8557df02d3aad448823cba5496908a45730d3ef8' into kraken

* commit '8557df02d3aad448823cba5496908a45730d3ef8':
  doc change: fix link in guidelines index.
2010-03-31 16:20:20 -07:00
Dirk Dougherty
8557df02d3 am 058e385b: doc change: fix link in guidelines index.
Merge commit '058e385b8bca0376c27a24a54f3b00777ef30e0a' into froyo-plus-aosp

* commit '058e385b8bca0376c27a24a54f3b00777ef30e0a':
  doc change: fix link in guidelines index.
2010-03-31 16:17:36 -07:00
Xia Wang
2c15966f8c 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

Change-Id: Ia4581b10b794c7b301d28019563bca832bcd8b90
2010-03-31 16:14:43 -07:00
Dirk Dougherty
058e385b8b doc change: fix link in guidelines index.
Change-Id: I2b9eb38eb503df5b3fd65e3d23e28712f40b09cd
2010-03-31 16:12:13 -07:00
Jeff Brown
6801cedb76 am 6a3e7dfa: am c738783c: Merge "Fix alarms with negative or very large wakup times." into froyo
Merge commit '6a3e7dfa87345244190403eaad71e760f11305ba' into kraken

* commit '6a3e7dfa87345244190403eaad71e760f11305ba':
  Fix alarms with negative or very large wakup times.
2010-03-31 16:06:53 -07:00
Jeff Brown
6a3e7dfa87 am c738783c: Merge "Fix alarms with negative or very large wakup times." into froyo
Merge commit 'c738783cc2b7b5bde1f0c25ed2cb4f9fd4df38cc' into froyo-plus-aosp

* commit 'c738783cc2b7b5bde1f0c25ed2cb4f9fd4df38cc':
  Fix alarms with negative or very large wakup times.
2010-03-31 16:00:58 -07:00
Jeff Brown
c738783cc2 Merge "Fix alarms with negative or very large wakup times." into froyo 2010-03-31 15:56:30 -07:00
Jeff Brown
11c5f1a65d Fix alarms with negative or very large wakup times.
When the wakeup time is negative, the kernel /dev/alarm driver
never triggers the alarm.  This can cause alarms to back up in the
priority queue since an alarm at the head with a negative wakup time
will never be triggered.  Now we use 0 as the wakup time which causes
an immediate triggering.

When the wakeup time is very large, it is possible for a numeric
overflow to occur when converting the timestamp from milliseconds
since epoch to nanoseconds.  This has been fixed by avoiding the
intermediate conversion in the JNI call so that overflow cannot
occur.

Bug: b/2558820
Change-Id: I4f5b4646a04090cc749a9fc5d3982a68402954ef
2010-03-31 15:38:08 -07:00
Dirk Dougherty
0da58f15c4 am e4fa5d76: am 36b3b5fc: doc change: several fixes for UI Guidelines doc.
Merge commit 'e4fa5d7669bba2cdb6f72379933005407a5bedc5' into kraken

* commit 'e4fa5d7669bba2cdb6f72379933005407a5bedc5':
  doc change: several fixes for UI Guidelines doc.
2010-03-31 15:04:25 -07:00
Dirk Dougherty
e4fa5d7669 am 36b3b5fc: doc change: several fixes for UI Guidelines doc.
Merge commit '36b3b5fc9a86a77488ed8b2497621ddca03d3cba' into froyo-plus-aosp

* commit '36b3b5fc9a86a77488ed8b2497621ddca03d3cba':
  doc change: several fixes for UI Guidelines doc.
2010-03-31 14:58:48 -07:00
Dirk Dougherty
d94a2bb07f am d1a1ea05: am 59e644e3: doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master
Merge commit 'd1a1ea05ba3aa48fd65ea225d5c5c757232e4979' into kraken

* commit 'd1a1ea05ba3aa48fd65ea225d5c5c757232e4979':
  doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master
2010-03-31 14:49:19 -07:00
Dirk Dougherty
36b3b5fc9a doc change: several fixes for UI Guidelines doc.
Change-Id: I351a076929e1fde0348460f4dfb269cfbcb262f2
2010-03-31 14:45:59 -07:00
Dirk Dougherty
d1a1ea05ba am 59e644e3: doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master
Merge commit '59e644e399e9a8dce48f28c34b5ed66974c41bd4' into froyo-plus-aosp

* commit '59e644e399e9a8dce48f28c34b5ed66974c41bd4':
  doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master
2010-03-31 14:45:50 -07:00
Dirk Dougherty
59e644e399 doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master 2010-03-31 14:24:34 -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