drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,102 Commits 1 Branch 0 Tags
Commit Graph

62102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
ff1fa5ef93 am 2c29a5cf: am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1 
* commit '2c29a5cf1658532bca4e34f816fa30312241a336':
  visualizer: reset buffer if playback is idle
 2011-11-11 11:51:14 -08:00
Andreas Huber
d8ad2fab90 am 40461ee7: am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1 
* commit '40461ee70161d8568663332f72be2353b04c34e7':
  Instead of asserting, signal a runtime error if the session doesn't contain
 2011-11-11 11:51:12 -08:00
Andreas Huber
5dd4c6bcb4 am 9a87a838: (-s ours) am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 
* commit '9a87a838028f3911a066a729cdb5ec688903a5ae':
  DO NOT MERGE: Instead of asserting, remove active streams if their sockets
 2011-11-11 11:51:11 -08:00
Andreas Huber
ff0bd468d8 am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 
* commit '9c981cd3d53238f10842368c1cd82d625b701a47':
  Disconnect on socket error on the RTSP control connection.
 2011-11-11 11:51:09 -08:00
Narayan Kamath
e5fe1b302d am 405fcc87: am 754c72ed: Notifiy callers when a speech synthesis error occurs. 
* commit '405fcc87b247d91ce2b54623f351e91b740813c0':
  Notifiy callers when a speech synthesis error occurs.
 2011-11-11 11:51:07 -08:00
Alex Sakhartchouk
93c47f1028 Fixing a race condition in RSSurfaceView. Bug 5601083 
When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context.

Change-Id: I7a382a701efde3264e5cd9b9a9b428ade5eb4a9a
 2011-11-11 11:49:45 -08:00
Dianne Hackborn
8f45e3e280 am be425cce: Merge "Fix issue #5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1 
* commit 'be425ccea47c13d3f8f3d877fdbdcb3c074f7e8b':
  Fix issue #5522658: Menu button shown on lock screen if app underneath requests it
 2011-11-11 11:48:33 -08:00
James Dong
9a176507a9 am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1 
* commit 'b7a000a6fb84ae75847e730332bae62ba1234999':
  Unhide the key to retriever location information in 3gp/mp4 files
 2011-11-11 11:48:27 -08:00
Andreas Huber
8a0654231f am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1 
* commit '23217182743521063655c6fb1b1580d3558cfbe7':
  Didn't mean to check this in...
 2011-11-11 11:48:16 -08:00
Robert Greenwalt
2c41bce3f2 am 424781e2: Fix NPE in ConnectivityService. 
* commit '424781e2e1a1f1447eea733ffd1dc0f8006b628e':
  Fix NPE in ConnectivityService.
 2011-11-11 11:48:11 -08:00
Eric Laurent
2c29a5cf16 am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1 
* commit '1f8c621279ddb163ee3d63bf32d79955679db0c5':
  visualizer: reset buffer if playback is idle
 2011-11-11 11:48:05 -08:00
Andreas Huber
40461ee701 am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1 
* commit 'cd556b82fd12dceb49e9d6543f80212721b220ec':
  Instead of asserting, signal a runtime error if the session doesn't contain
 2011-11-11 11:48:00 -08:00
Andreas Huber
9a87a83802 am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 
* commit '5d42075e450a49af2bb37ca3a9610921df7607f2':
  DO NOT MERGE: Instead of asserting, remove active streams if their sockets
 2011-11-11 11:47:58 -08:00
Andreas Huber
9c981cd3d5 am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 
* commit 'd9f25bc941746f268ab978e6b2af7b7c4ec2ea89':
  Disconnect on socket error on the RTSP control connection.
 2011-11-11 11:47:57 -08:00
Narayan Kamath
405fcc87b2 am 754c72ed: Notifiy callers when a speech synthesis error occurs. 
* commit '754c72ed9e8e83e5a913aa7552fc2e1b1b5277e0':
  Notifiy callers when a speech synthesis error occurs.
 2011-11-11 11:47:54 -08:00
Dianne Hackborn
be425ccea4 Merge "Fix issue #5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1 2011-11-11 11:36:14 -08:00
Matthew Xie
99164b4209 Merge "Add more comments to the file header to explain the state diagram" 2011-11-11 11:20:43 -08:00
Matthew Xie
cef4cb20c3 Add more comments to the file header to explain the state diagram 
The state diagram does not capture every messages. Here we explain
the missing parts to make the diagram clearer.

Change-Id: Ic5de5eb0556be4339d98023b0e7947d6e2cb30d1
 2011-11-11 11:15:21 -08:00
Scott Main
75eaae7060 Docs: update state list drawable with state_activated and revise selected/focused 
Change-Id: I6bd919fc71a74fc8135ed333c93d187e0d9e9d80
 2011-11-11 11:11:32 -08:00
James Dong
b7a000a6fb Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1 2011-11-11 10:49:24 -08:00
Andreas Huber
2321718274 Merge "Didn't mean to check this in..." into ics-mr1 2011-11-11 10:46:02 -08:00
Svetoslav Ganov
c350f1604f Instrumentation sendStringSync(String) may try to inject obsolete events. 
KeyEvents returned by KeyCharacterMap.getEvents() have the same time stamp
and the system rejects too old events. Hence, it is possible for an event
to become stale before it is injected if it takes too long to inject the
preceding ones. Now the time of the event is set just before injecting it.

Change-Id: I72b60d261f8bda857b331d0f1b1bd97f9f15def3
 2011-11-11 10:43:13 -08:00
Andreas Huber
54c7efa4dd Didn't mean to check this in... 
Change-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7
 2011-11-11 10:17:00 -08:00
Robert Greenwalt
424781e2e1 Fix NPE in ConnectivityService. 
If it's configured with a defined network but can't create a network state tracker
for it, it would NPE and restart the framework whenever a default network
disconnects.

bug:5603268
Change-Id: I816c4f522d766e0353a713623f6635b03395b01e
 2011-11-11 09:56:03 -08:00
Scott Main
8b4e2ccf15 Merge "docs: some helpful javadocs for network info" 2011-11-11 09:49:23 -08:00
Jesse Wilson
9f7ff11268 Merge "Document our potentially suprising behavior on date ranges ending at midnight." 2011-11-11 09:38:46 -08:00
Jeff Hamilton
bb951c8939 Changes for access control. 
The package name is now required when using the
NFC extras APIs so the context is stored away
and used to derive the package name to be sent
to the NfcService.

Bug: 4515759
Change-Id: I1a3aba3fc026e0090a914b0686fc4b8dec25b927
 2011-11-11 08:55:26 -08:00
Jesse Wilson
8d7fad5e67 Merge "Warn about changed behavior around '+' characters." 2011-11-11 08:22:33 -08:00
Eric Laurent
1f8c621279 Merge "visualizer: reset buffer if playback is idle" into ics-mr1 2011-11-11 08:17:22 -08:00
Jesse Wilson
41e0839b13 Warn about changed behavior around '+' characters. 
Bug: http://code.google.com/p/android/issues/detail?id=21064
Change-Id: I086c2c8433f05185a1496e2662734d239d8cbb74
 2011-11-11 11:16:17 -05:00
Kristian Monsen
a3c157eef0 Removing the ability to get native instrumentation as part of nav dump 
This is to be able to remove ANDROID_INSTRUMENTATION code.

Note that it would only print useful information if webcore
was compiled with ANDROID_INSTRUMENTATION on.

There is an open bug for problems with ANDROID_INSTRUMENTATION:
http://b/issue?id=2816327

Needs Browser CL:
https://android-git.corp.google.com/g/#/c/149442

Change-Id: Ie8c3c3a08a8bb15936831e25faac3155906bae70
 2011-11-11 16:11:36 +00:00
Jesse Wilson
99a64f4b1d Document our potentially suprising behavior on date ranges ending at midnight. 
Bug: http://code.google.com/p/android/issues/detail?id=18512
Change-Id: I968ca1cfcef79273ee856624a640d56b038b96be
 2011-11-11 11:03:21 -05:00
Andreas Huber
cd556b82fd Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1 2011-11-11 07:39:25 -08:00
Andreas Huber
5d42075e45 Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 2011-11-11 07:39:18 -08:00
Andreas Huber
d9f25bc941 Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 2011-11-11 07:39:11 -08:00
James Dong
f4c3cc06cb am 510180f1: am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1 
* commit '510180f162dee3ae5416a98caa07f58a754f4b3f':
  Add support for retrieving location information in mp4/3gpp files
 2011-11-11 15:34:21 +00:00
Akwasi Boateng
1333742bed am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp 
* commit 'cb0db0306b5849a35d3d99eea1b34ce019c6f0d8':
  Make the overridden ImageView#setVisibility remotable
  Clamp non-monotonic stats instead of dropping.
  DO NOT MERGE. Fix leak in LayoutTransition
  Fix lastVisible/global rects
  Fix Wimax-less build.
  Fix leak in LayoutTransition
  Deferring wallpaper update to improve workspace scrolling (issue 5506959)
  Terminate EGL when an app goes in the background
  boot animation is dithered and scaled
  Fix NdefRecord byte-stream constructor.
  PopupWindow dismiss() can get into a recursive loop.
  Fold WiMAX state into the mobile RSSI.
  Remove dedicated wimax icon to fix RSSI layout.
 2011-11-11 15:34:19 +00:00
Jamie Gennis
0ed4c7f8cc am 0c71e5ed: am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0 
* commit '0c71e5ed820350a4ae0517dc73d1f46cd3534b55':
  SystemUI: Disable HW acceleration for status bar
 2011-11-11 15:34:19 +00:00
Glenn Kasten
62b9aec7a0 Don't check return value of new for being == null 
new either succeeds or throws an exception

Change-Id: I1615e10c4f6730495c49e56b64714a00141ea8ff
 2011-11-11 07:30:19 -08:00
James Dong
510180f162 am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1 
* commit '08e42967b9e459b7beb22e859f1f1eba0546741b':
  Add support for retrieving location information in mp4/3gpp files
 2011-11-11 15:28:32 +00:00
Akwasi Boateng
cb0db0306b Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp 2011-11-11 15:20:20 +00:00
Svetoslav Ganov
2b51019220 am d00e75e9: am 7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0 
* commit 'd00e75e94d1aa5cee740a06a4ce760e49016f7f6':
  PopupWindow dismiss() can get into a recursive loop.
 2011-11-11 15:12:58 +00:00
Chet Haase
025e948d77 am ab51626f: am 30f03ac6: (-s ours) DO NOT MERGE. Fix leak in LayoutTransition 
* commit 'ab51626f22259e27ef376cbbc1d127524a57459d':
  DO NOT MERGE. Fix leak in LayoutTransition
 2011-11-11 15:12:56 +00:00
Jamie Gennis
1dd80cf4d4 am 787e2c27: am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0 
* commit '787e2c276a5645ffbaddc5c23f4deb66d182e80d':
  SystemUI: Disable HW acceleration for status bar
 2011-11-11 15:12:55 +00:00
Jeff Sharkey
0a63214f39 am 51c00a57: Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1 
* commit '51c00a57f4f956b4b0ce9562fa571b475ee6f6ae':
  Clamp non-monotonic stats instead of dropping.
 2011-11-11 15:12:51 +00:00
Daniel Sandler
b291fa96e3 am 992e77af: Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1 
* commit '992e77af1168ddce232b9b7702d01e5ccc7a249b':
  Fold WiMAX state into the mobile RSSI.
 2011-11-11 15:12:49 +00:00
Daniel Sandler
8c2ef85cce am 8b50bd8c: Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1 
* commit '8b50bd8c9ba594e2516014fcc4b950b8deb36312':
  Remove dedicated wimax icon to fix RSSI layout.
 2011-11-11 15:12:48 +00:00
Adam Powell
fcba1b60a8 am 0ddcad0b: Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1 
* commit '0ddcad0b4e203fe56aeca74547b13f6063ccb13b':
  Make the overridden ImageView#setVisibility remotable
 2011-11-11 15:12:46 +00:00
Adam Cohen
33be88cba8 am d562d300: Merge "Deferring wallpaper update to improve workspace scrolling (issue 5506959)" into ics-mr1 
* commit 'd562d300cde63ae023f09fc3c7ded0988dead5d1':
  Deferring wallpaper update to improve workspace scrolling (issue 5506959)
 2011-11-11 15:12:45 +00:00
John Reck
204a828599 am 9490fe40: Merge "Fix lastVisible/global rects" into ics-mr1 
* commit '9490fe4095171b9af380812b895101f8142d3cd5':
  Fix lastVisible/global rects
 2011-11-11 15:12:41 +00:00