Commit Graph

2815 Commits

Author SHA1 Message Date
Marco Nelissen
d43b194b69 Instead of using -1 for pid and uid in the simulator, and then having
to special-case the simulator case all over the framework, just use
getuid and getpid, and intercept those in the simulator wrapper.
2009-07-17 10:48:09 -07:00
Android (Google) Code Review
007a4a26e4 Merge change 7709
* changes:
  Fix MT Call screen stuck issue.
2009-07-17 10:29:54 -07:00
Android (Google) Code Review
8abec1e7e2 Merge change 7701
* changes:
  Clean up MP3Extractor code and fixes a bug that miscalculated the position of the header by a few bytes whenever we read in more data.
2009-07-17 09:44:25 -07:00
Android (Google) Code Review
f0c658d0df Merge change 7700
* changes:
  stagefright: initialize more of the OMX_BUFFERHEADERTYPE structure as they are apparently not cleared by the OMX implementation.
2009-07-17 09:35:37 -07:00
Android (Google) Code Review
f4c863c12b Merge change 7699
* changes:
  Implement IMSI function for CDMA phones
2009-07-17 09:26:22 -07:00
Android (Google) Code Review
17990932f6 Merge change 7625
* changes:
  Whitespace cleanup prior to real work.
2009-07-17 08:40:41 -07:00
Android (Google) Code Review
7a824fdef6 Merge change 7671
* changes:
  Free memory on low memory condition.
2009-07-17 07:47:18 -07:00
Android (Google) Code Review
37c6e7373d am 733cbb00: Merge change 7492 into donut
Merge commit '733cbb0009d3e16eac2383a694833bdbc0c7269e'

* commit '733cbb0009d3e16eac2383a694833bdbc0c7269e':
  Delete leaked global ref in AudioTrack constructor.
2009-07-17 02:09:14 -07:00
Android (Google) Code Review
dd5241c774 am 3735df20: Merge change 7545 into donut
Merge commit '3735df20ae9994a759aa9464534d57eab4af4011'

* commit '3735df20ae9994a759aa9464534d57eab4af4011':
  MountListener: When we connect to vold, explicitly mount external storage.
2009-07-17 02:09:06 -07:00
Android (Google) Code Review
f42cea37dd am 97a67cc2: Merge change 7544 into donut
Merge commit '97a67cc281805566d429d4ca6570348fcf6dabd9'

* commit '97a67cc281805566d429d4ca6570348fcf6dabd9':
  sdutil: Up the mount/unmount wait times to account for disk check + reaper time
2009-07-17 02:09:02 -07:00
Android (Google) Code Review
6c9343cfbb am 9db0d36c: Merge change 7600 into donut
Merge commit '9db0d36c6141d8e0ccf6ca6c450872f03b55c15f'

* commit '9db0d36c6141d8e0ccf6ca6c450872f03b55c15f':
  Update youtube bookmark
2009-07-17 02:08:53 -07:00
Android (Google) Code Review
ab5bc0ecd9 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-07-16 23:47:19 -07:00
Android (Google) Code Review
f4f4399f98 am a0eb87db: Merge change 7619 into donut
Merge commit 'a0eb87db12aed10bf578e06a35cf89d1779d7cf6'

* commit 'a0eb87db12aed10bf578e06a35cf89d1779d7cf6':
  Fixes #1861763. Prevents IllegalArgumentException in AbsListView on focus
2009-07-16 23:47:06 -07:00
Wink Saville
1b21dc82e4 am abccd7ea: (-s ours) DO NOT MERGE. Implement IMSI function for CDMA phones
Merge commit 'abccd7eaa52d0b8579ba3d1c954dfe7529945c0f'

* commit 'abccd7eaa52d0b8579ba3d1c954dfe7529945c0f':
  DO NOT MERGE. Implement IMSI function for CDMA phones
2009-07-16 23:46:59 -07:00
Android (Google) Code Review
0f3831a977 am 0a6a05cd: (-s ours) Merge change 7598 into donut
Merge commit '0a6a05cdb57561e2d932a62a018c83ca5667f4da'

* commit '0a6a05cdb57561e2d932a62a018c83ca5667f4da':
  DO NOT MERGE - Disable settings backup in Donut
2009-07-16 23:46:50 -07:00
Android (Google) Code Review
01d8996e3f am 43463bfb: (-s ours) Merge change 7572 into donut
Merge commit '43463bfb69fc8fab33afbd5b5f7fe4b7b823a7a2'

* commit '43463bfb69fc8fab33afbd5b5f7fe4b7b823a7a2':
  Fix issue #1985606 (Boot crash when battery level of < 15% is reported) in Donut
2009-07-16 23:46:45 -07:00
Mike Lockwood
24a7e04a62 EventHub: Compare name instead of id when excluding event input devices.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-17 00:10:10 -04:00
Android (Google) Code Review
d15d115e6f Merge change 7492 into donut
* changes:
  Delete leaked global ref in AudioTrack constructor.
2009-07-16 18:34:15 -07:00
Android (Google) Code Review
a9bd829a9d Merge change 7545 into donut
* changes:
  MountListener: When we connect to vold, explicitly mount external storage. Vold no longer mounts storage automatically so it doesnt interfere with the framework booting.
2009-07-16 18:10:48 -07:00
Android (Google) Code Review
af99f836ac Merge change 7544 into donut
* changes:
  sdutil: Up the mount/unmount wait times to account for disk check + reaper time
2009-07-16 18:10:24 -07:00
Dianne Hackborn
4f1037ac71 am fae76f5b: Fix issue #1985502: Sapphire (and any other device) reports that it has a hard keyboard
Merge commit 'fae76f5bdeed68efd85805db143b0426de92f7e0'

* commit 'fae76f5bdeed68efd85805db143b0426de92f7e0':
  Fix issue #1985502: Sapphire (and any other device) reports that it has a hard keyboard
2009-07-16 17:54:44 -07:00
Android (Google) Code Review
3c23feb05a am 9ce081aa: Merge change 7551 into donut
Merge commit '9ce081aa2493dc163a42decfd4e1756b5c55a834'

* commit '9ce081aa2493dc163a42decfd4e1756b5c55a834':
  Add ability to delay messages in Filter based on constraint.  Use this to delay 500ms for delete keys in the search dialog.
2009-07-16 17:54:35 -07:00
Android (Google) Code Review
e98bd005f2 am eb09c6a0: Merge change 7568 into donut
Merge commit 'eb09c6a07abf58b4da2c4baf3800a1f96e3b0731'

* commit 'eb09c6a07abf58b4da2c4baf3800a1f96e3b0731':
  Issue #1969025: need api for launching intent as if it were coming from another component
2009-07-16 17:54:31 -07:00
Android (Google) Code Review
73232cdd3e am 58d19d1f: Merge change 7581 into donut
Merge commit '58d19d1f6321161fdcd10140fe7b9d9053f80bd2'

* commit '58d19d1f6321161fdcd10140fe7b9d9053f80bd2':
  Fix bug that would cause files with blank title tags to not be shown in the music app.
2009-07-16 17:54:27 -07:00
Android (Google) Code Review
cab207c946 am 0bb0597a: Merge change 7556 into donut
Merge commit '0bb0597a4b5b0825f710f1bd63efb7069cecd918'

* commit '0bb0597a4b5b0825f710f1bd63efb7069cecd918':
  Temporarily suppress ServiceTest.
2009-07-16 17:54:21 -07:00
Android (Google) Code Review
d537a17a20 am 65d99c3c: Merge change 7537 into donut
Merge commit '65d99c3cbf149776c7ec4ea1f3cb1f4470d2be83'

* commit '65d99c3cbf149776c7ec4ea1f3cb1f4470d2be83':
  Fixing a race condition that causes synthesis to not be aborted
2009-07-16 17:54:13 -07:00
Android (Google) Code Review
72427b0d04 am 2493097c: Merge change 7566 into donut
Merge commit '2493097cb077b772af779bf14251e3ac0fff95f8'

* commit '2493097cb077b772af779bf14251e3ac0fff95f8':
  Fix the style of preferences headers in the light theme.
2009-07-16 17:54:07 -07:00
Android (Google) Code Review
9793c45993 am 3e1663a2: Merge change 7536 into donut
Merge commit '3e1663a2539ff0b939193304cfb601f6b134af7d'

* commit '3e1663a2539ff0b939193304cfb601f6b134af7d':
  fix FILE* version of ZipUtils::inflateToBuffer
2009-07-16 17:54:01 -07:00
Android (Google) Code Review
7f608f0345 am 8e3c3f64: Merge change 7514 into donut
Merge commit '8e3c3f6461b53dc587ba92b3fe8cfbeb985f8514'

* commit '8e3c3f6461b53dc587ba92b3fe8cfbeb985f8514':
  Only parse search suggestions that look like HTML
2009-07-16 17:53:57 -07:00
Android (Google) Code Review
ea7b049543 am 5380aa29: Merge change 7512 into donut
Merge commit '5380aa29470274de5b3e445d577ef0834cfacb71'

* commit '5380aa29470274de5b3e445d577ef0834cfacb71':
  Get rid of drawing hacks for search dialog suggestions
2009-07-16 17:53:53 -07:00
Bjorn Bringert
cb471dd228 am ee716fa2: Make sure SearchDialog.mSearchable != null in key handlers
Merge commit 'ee716fa2b03666622a73f8cc54dae4afd091353d'

* commit 'ee716fa2b03666622a73f8cc54dae4afd091353d':
  Make sure SearchDialog.mSearchable != null in key handlers
2009-07-16 17:53:48 -07:00
Android (Google) Code Review
2bc671d78c am c93af6dc: Merge change 7441 into donut
Merge commit 'c93af6dc5bc78f02d4ee549890da12dc669fc2fe'

* commit 'c93af6dc5bc78f02d4ee549890da12dc669fc2fe':
  Allow system colors in <font> tags
2009-07-16 17:53:44 -07:00
Android (Google) Code Review
795e8f42c9 am 0d039ba3: Merge change 7508 into donut
Merge commit '0d039ba328a59fc81280fbecf68aad2d2cba7234'

* commit '0d039ba328a59fc81280fbecf68aad2d2cba7234':
  keystore: Fix a compile warning.
2009-07-16 17:53:40 -07:00
Android (Google) Code Review
14b6dc025c Merge change 7600 into donut
* changes:
  Update youtube bookmark
2009-07-16 17:51:01 -07:00
Android (Google) Code Review
da1bafd604 Merge change 7633
* changes:
  Fix conflict with automatic DPI support on high density devices by forcing bitmap loading to not be scaled.
2009-07-16 17:49:05 -07:00
Android (Google) Code Review
df38faa9a1 Merge change 7619 into donut
* changes:
  Fixes #1861763. Prevents IllegalArgumentException in AbsListView on focus search.
2009-07-16 17:06:47 -07:00
Android (Google) Code Review
a931c141eb Merge change 7598 into donut
* changes:
  DO NOT MERGE - Disable settings backup in Donut
2009-07-16 15:38:41 -07:00
Android (Google) Code Review
b6b5fd0769 Merge change 7572 into donut
* changes:
  Fix issue #1985606 (Boot crash when battery level of < 15% is reported) in Donut
2009-07-16 15:18:38 -07:00
Android (Google) Code Review
7e1bb6da48 Merge change 7587
* changes:
  Fixes merge conflict.
2009-07-16 15:17:55 -07:00
Android (Google) Code Review
bd081ebd0c Merge change 7590
* changes:
  Update rollo and renderscript to the new ACC compiler interface.
2009-07-16 15:09:38 -07:00
Jean-Baptiste Queru
77de619c05 Merge commit 'goog/readonly-korg-master' into merge_korg_master
* commit 'goog/readonly-korg-master':
  Fixed Android issue #400, where the Intent documentation was inaccurate in a number of places, undoubtedly causing untold grief to innumerable masses.
  Bug Fixed for libagl.
2009-07-16 14:54:11 -07:00
Android (Google) Code Review
e9fd333a79 Merge change 7551 into donut
* changes:
  Add ability to delay messages in Filter based on constraint.  Use this to delay 500ms for delete keys in the search dialog.
2009-07-16 14:41:10 -07:00
Android (Google) Code Review
24471165ed Merge change 7568 into donut
* changes:
  Issue #1969025: need api for launching intent as if it were coming from another component
2009-07-16 14:31:52 -07:00
Android (Google) Code Review
986e35410c Merge change 7581 into donut
* changes:
  Fix bug that would cause files with blank title tags to not be shown in the music app.
2009-07-16 14:12:55 -07:00
Jean-Baptiste Queru
b2fb847ff4 merge-ignore changes that were already in or that are not relevant
Merge commit '7ecccee0d0c32ee472c9a74f4ccb8b152b074402' into HEAD
2009-07-16 13:47:28 -07:00
Android (Google) Code Review
bab51567e1 Merge change 7556 into donut
* changes:
  Temporarily suppress ServiceTest.
2009-07-16 13:46:57 -07:00
Android (Google) Code Review
3b5fb5dcf1 Merge change 7567
* changes:
  Send all battery broadcasts with REGISTERED_ONLY_BEFORE_BOOT
2009-07-16 13:45:46 -07:00
Android (Google) Code Review
6fd0019bd2 Merge change 7537 into donut
* changes:
  Fixing a race condition that causes synthesis to not be aborted even if stop is called.
2009-07-16 13:28:04 -07:00
Android (Google) Code Review
e85b0108fa Merge change 7566 into donut
* changes:
  Fix the style of preferences headers in the light theme.
2009-07-16 13:17:31 -07:00
Android (Google) Code Review
a70bb07534 Merge change 7491
* changes:
  Update rollo with new interactivity model.
2009-07-16 12:58:54 -07:00