26390 Commits

Author SHA1 Message Date
Doug Zongker
24c737ccdd am d581484e: Merge "Verify hostname where possible, and clarify where not." into froyo
Merge commit 'd581484ef8fac80c15ebf652e66f918374df5109' into gingerbread

* commit 'd581484ef8fac80c15ebf652e66f918374df5109':
  Verify hostname where possible, and clarify where not.
2010-06-30 11:17:00 -07:00
Doug Zongker
d581484ef8 Merge "Verify hostname where possible, and clarify where not." into froyo 2010-06-30 11:12:19 -07:00
Mike Lockwood
9823d203f2 Merge "MTP: replace printfs with logcat" 2010-06-30 11:03:41 -07:00
Mike Lockwood
3e6616dd3d MTP: replace printfs with logcat
Change-Id: I2c30921098e2dc049dc5fc1e0a548ead33c363e0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-30 13:59:32 -04:00
Brian Carlstrom
2658cf47e5 Merge "frameworks/base updates to track merge from dalvik-dev - frameworks and CoreTests modules now depend on bouncycastle - update preloades classes for NativeBN package change - moved CryptoTest to libcore - updated api" 2010-06-30 10:55:07 -07:00
Dianne Hackborn
3c80a4a044 Implement default key handling for native code.
The native code now maintains a list of all keys that may use
default handling.  If the app finishes one of these keys
without handling it, the key will be passed back off to Java
for default treatment.

Change-Id: I6a842a0d728eeafa4de7142fae573f8c11099e18
2010-06-30 10:49:40 -07:00
Ben Murdoch
08968fa59e Merge "Receive notification from native webcore that the page being viewed has marked itself as being an installable web app. Default implementation in the WebChromeClient does nothing." 2010-06-30 10:35:08 -07:00
Andreas Huber
c543a21a40 Support for vanilla YUV420sp => RGB565 color conversion.
Change-Id: I22e5b554909e169eaf153d1f25b636f6f04a1871
2010-06-30 10:32:39 -07:00
Scott Main
92dbad8ab0 am b4d2e42a: docs: revise menu guide to focus more on using menu resources instead of defining menus in code. And revise some style.
Merge commit 'b4d2e42a8508a09f944b13f27c043952eef6c1cc' into gingerbread

* commit 'b4d2e42a8508a09f944b13f27c043952eef6c1cc':
  docs: revise menu guide to focus more on using menu resources
2010-06-30 09:01:01 -07:00
Mike Lockwood
3dcfeac890 am 2a28f4b4: am 5b8364a9: GPS: stifle some logging
Merge commit '2a28f4b40c36ab3a8a80467eb5781ae6e5811369'

* commit '2a28f4b40c36ab3a8a80467eb5781ae6e5811369':
  GPS: stifle some logging
2010-06-30 07:07:06 -07:00
Mike Lockwood
2a28f4b40c am 5b8364a9: GPS: stifle some logging
Merge commit '5b8364a929e26b30d55de9d330e1cb9a11df6208' into gingerbread-plus-aosp

* commit '5b8364a929e26b30d55de9d330e1cb9a11df6208':
  GPS: stifle some logging
2010-06-30 07:04:28 -07:00
Mike Lockwood
5b8364a929 GPS: stifle some logging
Change-Id: Ifc68f27a6cb841240db182f4c77ddd8085a8c149
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-30 09:59:46 -04:00
Brian Carlstrom
570bb5618a frameworks/base updates to track merge from dalvik-dev
- frameworks and CoreTests modules now depend on bouncycastle
- update preloades classes for NativeBN package change
- moved CryptoTest to libcore
- updated api

Change-Id: I47363a463f074af205b5bd128cd98faab70ac849
2010-06-30 00:54:29 -07:00
Dan Egnor
7fc93c36ae Verify hostname where possible, and clarify where not.
Bug: 2807409
Change-Id: I6f6a6b22a48149d9f1f45ff8f53103b25706ecc0
2010-06-29 19:19:10 -07:00
Adam Powell
0e94b5151d Add subtitles for action bars and context modes.
Fix an issue where context mode content was cleared before animating out.

Change-Id: Ie7a065e65bc18e3da32de07543d0f71d2a2d648c
2010-06-29 19:00:15 -07:00
James Dong
bd800f40ac am 42dd9908: am f7679a04: Merge "Added encoding parameters set up for H263 video encoder" into gingerbread
Merge commit '42dd99084d0069ccd90f0305ce374fd943a09de7'

* commit '42dd99084d0069ccd90f0305ce374fd943a09de7':
  Added encoding parameters set up for H263 video encoder
2010-06-29 17:30:42 -07:00
James Dong
42dd99084d am f7679a04: Merge "Added encoding parameters set up for H263 video encoder" into gingerbread
Merge commit 'f7679a0493d59da8c759a6be639be5110c50fb98' into gingerbread-plus-aosp

* commit 'f7679a0493d59da8c759a6be639be5110c50fb98':
  Added encoding parameters set up for H263 video encoder
2010-06-29 17:27:29 -07:00
James Dong
f7679a0493 Merge "Added encoding parameters set up for H263 video encoder" into gingerbread 2010-06-29 17:24:10 -07:00
Scott Main
b4d2e42a85 docs: revise menu guide to focus more on using menu resources
instead of defining menus in code.
And revise some style.

Change-Id: I0a5a19a51062d72cdb9045c9607cab04b69f554c
2010-06-29 17:13:02 -07:00
Chris Tate
41254a8ddd am af4a2d1f: am ddcb543a: Merge "Fix native input dispatch in the emulator." into gingerbread
Merge commit 'af4a2d1f52c7d54408db341781399d2886de72c1'

* commit 'af4a2d1f52c7d54408db341781399d2886de72c1':
  Fix native input dispatch in the emulator.
2010-06-29 17:06:31 -07:00
Chris Tate
af4a2d1f52 am ddcb543a: Merge "Fix native input dispatch in the emulator." into gingerbread
Merge commit 'ddcb543ac8d9615ea78fbf8341949f54d86e6fbc' into gingerbread-plus-aosp

* commit 'ddcb543ac8d9615ea78fbf8341949f54d86e6fbc':
  Fix native input dispatch in the emulator.
2010-06-29 17:03:43 -07:00
Chris Tate
ddcb543ac8 Merge "Fix native input dispatch in the emulator." into gingerbread 2010-06-29 17:01:04 -07:00
Jeff Brown
0b72e82c5f Fix native input dispatch in the emulator.
Set a default orientation of ROTATION_0.
Added some more careful checks based on whether we have valid
absolute axis information from the driver.
Reset key repeating during configuration changes since the keyboard
device may have been removed.

Change-Id: I685960828acffcb17595fc5683309e8064a76714
2010-06-29 16:52:21 -07:00
James Dong
c0ab2a6458 Added encoding parameters set up for H263 video encoder
Also:
- Allowed start() call when encoder already starts and stop() call when encoder has not started yet
- Handled default value for audio/video sources/encoders and file output format

Change-Id: I03b2f7d3cf570baa0fd011a8c0ad200f2f2a5da1
2010-06-29 16:44:19 -07:00
Scott Main
8c464e811f am 7c8ca29e: am e42b1867: am 4fb91d9f: docs: fix typo
Merge commit '7c8ca29e7097fa10b9e4c442a93fe05ded5e0d79'

* commit '7c8ca29e7097fa10b9e4c442a93fe05ded5e0d79':
  docs: fix typo
2010-06-29 15:52:30 -07:00
Scott Main
7c8ca29e70 am e42b1867: am 4fb91d9f: docs: fix typo
Merge commit 'e42b18677e11d27fa1d3eaa1ffcb1f98c5fc8cbf' into gingerbread-plus-aosp

* commit 'e42b18677e11d27fa1d3eaa1ffcb1f98c5fc8cbf':
  docs: fix typo
2010-06-29 15:49:37 -07:00
Scott Main
e42b18677e am 4fb91d9f: docs: fix typo
Merge commit '4fb91d9f1bede8ad49365913804532ca57206455' into gingerbread

* commit '4fb91d9f1bede8ad49365913804532ca57206455':
  docs: fix typo
2010-06-29 15:47:42 -07:00
Mathias Agopian
e595a547fc am 33df868b: am 1eb442ee: Merge "remove a hack that was used only used on h/w we no longer support." into gingerbread
Merge commit '33df868bb35726d250c8a6d0ebd8c84749ffd51f'

* commit '33df868bb35726d250c8a6d0ebd8c84749ffd51f':
  remove a hack that was used only used on h/w we no longer support.
2010-06-29 15:36:53 -07:00
Mathias Agopian
33df868bb3 am 1eb442ee: Merge "remove a hack that was used only used on h/w we no longer support." into gingerbread
Merge commit '1eb442eef737051bd2734d823fa4c12c17c1da36' into gingerbread-plus-aosp

* commit '1eb442eef737051bd2734d823fa4c12c17c1da36':
  remove a hack that was used only used on h/w we no longer support.
2010-06-29 15:35:13 -07:00
Mathias Agopian
1eb442eef7 Merge "remove a hack that was used only used on h/w we no longer support." into gingerbread 2010-06-29 15:33:36 -07:00
Mathias Agopian
c19ffcba19 remove a hack that was used only used on h/w we no longer support.
this should fix the opal build.

Change-Id: I43d7633696fea5be6bc834293a832d22f6bdfc61
2010-06-29 15:31:58 -07:00
Scott Main
4fb91d9f1b docs: fix typo
Change-Id: I39849068bb1b35a766df93ab3440829730efabaa
2010-06-29 15:22:03 -07:00
Joe Malin
7d433aabb7 Javadoc for test case classes
Change-Id: Ibfa035cfe9091a81fca8bd0a6c141ec26c2de139
2010-06-29 15:03:58 -07:00
The Android Open Source Project
3fc85a2a58 am 799a5a61: am 2533a6ad: set up fast-forward from froyo-release to gingerbread
Merge commit '799a5a61d5813be83c4d0814b04c374adfe3a989'

* commit '799a5a61d5813be83c4d0814b04c374adfe3a989': (22 commits)
  Properly note the current active restore set's token
  Do not log AT command traffic by default.
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
  TimedEventQueue is apparently important for glitch-free media playback, and so
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
  When filling the cache, we always time out waiting for a condition that won't occur.
  Respond to changes in throttle policy.
  Fix Tethering of multiple downstream ifaces.
  Update Framework to support multiple dhpc ranges
  Dumb late-night typo.
  Use ViewRoot.addConfigCallback instead of a BroadcastReceiver.
  Clean up changing AP configuration
  Grant permissions to apps on sd when enabling/disabling packages.
  Fix issue #2512507: Shortcuts and Widgets lost on upgrading from Eclair to FRE70D
  Switch default install location to unspecified.
  Fix problem with calling onConfigurationChanged() too much.
  Preserve widgets on upgrade.
  Need to keep new package's cert when using original-package.
  Pick up default install location
  Fix 2463886: Allow delayed fetching of DevicePolicyManager in LockPatternUtils.
  ...
2010-06-29 14:42:32 -07:00
The Android Open Source Project
799a5a61d5 am 2533a6ad: set up fast-forward from froyo-release to gingerbread
Merge commit '2533a6ad3f378db5f160546d10345730f68d676c' into gingerbread-plus-aosp

* commit '2533a6ad3f378db5f160546d10345730f68d676c': (22 commits)
  Properly note the current active restore set's token
  Do not log AT command traffic by default.
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
  TimedEventQueue is apparently important for glitch-free media playback, and so
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
  When filling the cache, we always time out waiting for a condition that won't occur.
  Respond to changes in throttle policy.
  Fix Tethering of multiple downstream ifaces.
  Update Framework to support multiple dhpc ranges
  Dumb late-night typo.
  Use ViewRoot.addConfigCallback instead of a BroadcastReceiver.
  Clean up changing AP configuration
  Grant permissions to apps on sd when enabling/disabling packages.
  Fix issue #2512507: Shortcuts and Widgets lost on upgrading from Eclair to FRE70D
  Switch default install location to unspecified.
  Fix problem with calling onConfigurationChanged() too much.
  Preserve widgets on upgrade.
  Need to keep new package's cert when using original-package.
  Pick up default install location
  Fix 2463886: Allow delayed fetching of DevicePolicyManager in LockPatternUtils.
  ...
2010-06-29 14:38:47 -07:00
Adam Powell
9f0fda8430 Merge "Added context modes to ActionBar API." 2010-06-29 14:37:41 -07:00
The Android Open Source Project
2533a6ad3f set up fast-forward from froyo-release to gingerbread
Change-Id: I22fc9465f5d8a0144b31803f431602fe3bda516a
2010-06-29 14:34:35 -07:00
Adam Powell
89e0645b41 Added context modes to ActionBar API.
Change-Id: I7c3e782cbf01be7bc671b377fb4d706040888833
2010-06-29 14:04:58 -07:00
Daniel Sandler
04f229a40d am 77655393: am 5d7f6e61: Merge "Support for tapping on an immersive-mode priority notification." into gingerbread
Merge commit '776553934aa254b4240fc84ef6d97105a640348e'

* commit '776553934aa254b4240fc84ef6d97105a640348e':
  Support for tapping on an immersive-mode priority notification.
2010-06-29 12:32:57 -07:00
Daniel Sandler
776553934a am 5d7f6e61: Merge "Support for tapping on an immersive-mode priority notification." into gingerbread
Merge commit '5d7f6e614e7ead1fbe40a6886f78c31809bcbd40' into gingerbread-plus-aosp

* commit '5d7f6e614e7ead1fbe40a6886f78c31809bcbd40':
  Support for tapping on an immersive-mode priority notification.
2010-06-29 12:30:35 -07:00
Daniel Sandler
5d7f6e614e Merge "Support for tapping on an immersive-mode priority notification." into gingerbread 2010-06-29 12:28:07 -07:00
Dianne Hackborn
639061d9c2 am b5f05d00: am 0934fbb6: Merge "Update native activity & event APIs to follow correct conventions." into gingerbread
Merge commit 'b5f05d0018d72531e40c2afadfee90e9bc0c8893'

* commit 'b5f05d0018d72531e40c2afadfee90e9bc0c8893':
  Update native activity & event APIs to follow correct conventions.
2010-06-29 12:21:16 -07:00
Daniel Sandler
27a8be4b35 Support for tapping on an immersive-mode priority notification.
When the user taps on an intruder alert (the priority
notification in immersive mode), the .contentIntent in the
Notification object will be sent, just as we handle tapping
on a normal Notification in the windowshade.

Change-Id: Ib6991837b0b2122fe138cddacf347fdbc426b99d
2010-06-29 15:19:54 -04:00
Dianne Hackborn
b5f05d0018 am 0934fbb6: Merge "Update native activity & event APIs to follow correct conventions." into gingerbread
Merge commit '0934fbb6b81006fdf6a76b6519201d2f472a1908' into gingerbread-plus-aosp

* commit '0934fbb6b81006fdf6a76b6519201d2f472a1908':
  Update native activity & event APIs to follow correct conventions.
2010-06-29 12:18:58 -07:00
Dianne Hackborn
0934fbb6b8 Merge "Update native activity & event APIs to follow correct conventions." into gingerbread 2010-06-29 12:17:20 -07:00
Andreas Huber
f42c181ece am d6dcec4f: am fd751426: Merge "Add qcom\'s new OMX components to the list." into gingerbread
Merge commit 'd6dcec4f79737623051378cb99858a4032fa8005'

* commit 'd6dcec4f79737623051378cb99858a4032fa8005':
  Add qcom's new OMX components to the list.
2010-06-29 11:51:27 -07:00
Andreas Huber
d6dcec4f79 am fd751426: Merge "Add qcom\'s new OMX components to the list." into gingerbread
Merge commit 'fd751426ee05243dc8c29b90ac248fa3df8911a5' into gingerbread-plus-aosp

* commit 'fd751426ee05243dc8c29b90ac248fa3df8911a5':
  Add qcom's new OMX components to the list.
2010-06-29 11:48:57 -07:00
Andreas Huber
fd751426ee Merge "Add qcom's new OMX components to the list." into gingerbread 2010-06-29 11:45:39 -07:00
Andreas Huber
8ef64c9606 Add qcom's new OMX components to the list.
Change-Id: Ic8d261aaa5b15c1be7e6d57aee6be51cecb10bb1
2010-06-29 11:38:41 -07:00
Xia Wang
2c8b142708 am 591908fd: am 120a58fb: Extend unit test framework for Wifi soft AP configuration Add test case: testApSsidWithAlphabet
Merge commit '591908fd3fd1a84303bbc76c5c44d5cb0ee0bc94'

* commit '591908fd3fd1a84303bbc76c5c44d5cb0ee0bc94':
  Extend unit test framework for Wifi soft AP configuration
2010-06-29 11:34:18 -07:00