1872 Commits

Author SHA1 Message Date
Android (Google) Code Review
f045bb2581 am 0c97c7c8: Merge change 1668 into donut
Merge commit '0c97c7c8562048135cc129044219f9bbdfc1f108'

* commit '0c97c7c8562048135cc129044219f9bbdfc1f108':
  Document exception from parse3339
2009-05-14 17:22:30 -07:00
Android (Google) Code Review
0c97c7c856 Merge change 1668 into donut
* changes:
  Document exception from parse3339
2009-05-14 17:21:11 -07:00
Android (Google) Code Review
85119a427f am 14ad07f6: Merge change 1708 into donut
Merge commit '14ad07f604ecd08436680a046363d37952c278f6'

* commit '14ad07f604ecd08436680a046363d37952c278f6':
  Fixes #1853550. Prevent NPE when calling the PopupWindow() and PopupWindow(int, int) constructors. Instead, throw an IllegalStateException when trying to show a popup with no content view.
2009-05-14 16:44:18 -07:00
Android (Google) Code Review
14ad07f604 Merge change 1708 into donut
* changes:
  Fixes #1853550. Prevent NPE when calling the PopupWindow() and PopupWindow(int, int) constructors. Instead, throw an IllegalStateException when trying to show a popup with no content view.
2009-05-14 16:42:46 -07:00
Romain Guy
39a6dc59e6 am a3519811: Fix the build, again.
Merge commit 'a35198117ed8ba356e814863066777ee9f37f8e1'

* commit 'a35198117ed8ba356e814863066777ee9f37f8e1':
  Fix the build, again.
2009-05-14 16:32:17 -07:00
Romain Guy
a35198117e Fix the build, again. 2009-05-14 16:29:18 -07:00
The Android Open Source Project
3f229fe7e8 update api to match after merge 2009-05-14 16:28:49 -07:00
Romain Guy
448ecf5a94 Fixes #1853550. Prevent NPE when calling the PopupWindow() and PopupWindow(int, int) constructors. Instead, throw an IllegalStateException when trying to show a popup with no content view. 2009-05-14 16:03:42 -07:00
Android (Google) Code Review
780d61dd97 am d1f7b3a5: Merge change 1704 into donut
Merge commit 'd1f7b3a5720a4d6d92c4eea5a1fe812a790a7442'

* commit 'd1f7b3a5720a4d6d92c4eea5a1fe812a790a7442':
  New feature to track down #1846038. Adds the ability to export flags encoded in int values so as to make them human readable in HierarchyViewer.
2009-05-14 15:49:37 -07:00
Android (Google) Code Review
d1f7b3a572 Merge change 1704 into donut
* changes:
  New feature to track down #1846038. Adds the ability to export flags encoded in int values so as to make them human readable in HierarchyViewer.
2009-05-14 15:47:37 -07:00
Romain Guy
809a7f6080 New feature to track down #1846038. Adds the ability to export flags encoded in int values so as to make them human readable in HierarchyViewer. 2009-05-14 15:44:42 -07:00
Android (Google) Code Review
67fd6d50af am 1c9a92fd: Merge change 1690 into donut
Merge commit '1c9a92fd9fbe192f24e53c26cddeab401cefb108'

* commit '1c9a92fd9fbe192f24e53c26cddeab401cefb108':
  Rework some code so that it works the way it was supposed to work.
2009-05-14 15:40:01 -07:00
Android (Google) Code Review
1c9a92fd9f Merge change 1690 into donut
* changes:
  Rework some code so that it works the way it was supposed to work.
2009-05-14 15:32:42 -07:00
Marco Nelissen
80a538d656 am 9ea92317: Rearrange some code so it makes more sense. Thanks, findbugs.
Merge commit '9ea923174c2daffd9b6a1cd630018d3fdfe91f62'

* commit '9ea923174c2daffd9b6a1cd630018d3fdfe91f62':
  Rearrange some code so it makes more sense. Thanks, findbugs.
2009-05-14 15:21:43 -07:00
Marco Nelissen
9ea923174c Rearrange some code so it makes more sense. Thanks, findbugs. 2009-05-14 15:11:23 -07:00
Marco Nelissen
3537506c88 Rework some code so that it works the way it was supposed to work. 2009-05-14 14:57:55 -07:00
Android (Google) Code Review
5f4a2a66ce am 94f70cbb: Merge change 1685 into donut
Merge commit '94f70cbbe29c3aca748df9d543c366d838f6598b'

* commit '94f70cbbe29c3aca748df9d543c366d838f6598b':
  Remove unnecessary code.
2009-05-14 14:56:55 -07:00
Marco Nelissen
679bfc1773 am 1746d6fe: Fix a bug that findbugs found
Merge commit '1746d6fefcb1b4869f475a81f5aec35db4695603'

* commit '1746d6fefcb1b4869f475a81f5aec35db4695603':
  Fix a bug that findbugs found
2009-05-14 14:53:36 -07:00
Android (Google) Code Review
4ae6aa232b am 109b21ba: Merge change 1677 into donut
Merge commit '109b21bab5a9eb6c17e067b11784ade36129f24f'

* commit '109b21bab5a9eb6c17e067b11784ade36129f24f':
  Findbugs fixes.
2009-05-14 14:53:35 -07:00
Android (Google) Code Review
aa2b7237d1 am 2a5cfe51: Merge change 1590 into donut
Merge commit '2a5cfe519298702ef71ff8755b14f8daf6a92b2a'

* commit '2a5cfe519298702ef71ff8755b14f8daf6a92b2a':
  Add wifi multicast filter api (enable/disable).
2009-05-14 14:53:35 -07:00
Android (Google) Code Review
d6ea77e1a4 am 4a8fb93f: Merge change 1638 into donut
Merge commit '4a8fb93f5e320f5bd5c1dd272339ae499e4b4ec4'

* commit '4a8fb93f5e320f5bd5c1dd272339ae499e4b4ec4':
  fix window layout problem in ViewRoot
2009-05-14 14:53:34 -07:00
Marco Nelissen
afee71a999 am fafb16c5: Fix typo
Merge commit 'fafb16c5ae18816bd048428e60f46aec1e993b20'

* commit 'fafb16c5ae18816bd048428e60f46aec1e993b20':
  Fix typo
2009-05-14 14:53:34 -07:00
Android (Google) Code Review
2848954530 am 02c1c46f: Merge change 1674 into donut
Merge commit '02c1c46fff22490f884f05520d58eadae1442db8'

* commit '02c1c46fff22490f884f05520d58eadae1442db8':
  gps: Time out after 1 minute if we are unable to get a fix and our fix interval is long.
2009-05-14 14:53:34 -07:00
Romain Guy
a9e0bdbbd0 am d4103d0d: Fix the build
Merge commit 'd4103d0d143f3774a2fc9e35afb0fffc2160d7fc'

* commit 'd4103d0d143f3774a2fc9e35afb0fffc2160d7fc':
  Fix the build
2009-05-14 14:53:33 -07:00
Android (Google) Code Review
a64b860749 am aa642c0c: Merge changes 1591,1596 into donut
Merge commit 'aa642c0cc20293137376d44f8221876c121e5be9'

* commit 'aa642c0cc20293137376d44f8221876c121e5be9':
  Get the backup calling through to the file backup helper.
  Fix typos.
  Add a new feature to android.os.Debug to add the ability to inject only specific fields when calling setFieldsOn().
  Fixes #1836075. Adds consistency checks for the View hierarchy. To enable them, you need a debug build and ViewDebug.sConsistencyCheckEnabled set to true in debug.prop. This change also lets you easily enable drawing and layout profiling in ViewRoot by setting ViewRoot.sProfileDrawing, ViewRoot.sProfileLayout and ViewRoot.sShowFps in debug.prop with a debug build.
  Add Intent.ACTION_APP_ERROR
2009-05-14 14:53:27 -07:00
Android (Google) Code Review
94f70cbbe2 Merge change 1685 into donut
* changes:
  Remove unnecessary code.
2009-05-14 14:44:34 -07:00
Marco Nelissen
4fb27ba22d Remove unnecessary code. 2009-05-14 14:18:23 -07:00
Marco Nelissen
1746d6fefc Fix a bug that findbugs found 2009-05-14 13:31:26 -07:00
Android (Google) Code Review
109b21bab5 Merge change 1677 into donut
* changes:
  Findbugs fixes.
2009-05-14 13:30:58 -07:00
Android (Google) Code Review
2a5cfe5192 Merge change 1590 into donut
* changes:
  Add wifi multicast filter api (enable/disable). Fixes 1833432.  Automatically re-disables any request when the app exits/crashes.  Also hooked into Battery Stats for power managment analysis.
2009-05-14 13:24:52 -07:00
Marco Nelissen
d282ac8610 Findbugs fixes. 2009-05-14 13:18:16 -07:00
Android (Google) Code Review
4a8fb93f5e Merge change 1638 into donut
* changes:
  fix window layout problem in ViewRoot  * don't scale LayoutParams (this must be app's scale).  * scale the layout params' coordinates & size only when requesting layout. In SurfaceView, window's x,y wasn't scaled before sending to window manager.
2009-05-14 13:00:05 -07:00
Mitsuru Oshima
3d91492d69 fix window layout problem in ViewRoot
* don't scale LayoutParams (this must be app's scale).
 * scale the layout params' coordinates & size only when requesting layout.
In SurfaceView, window's x,y wasn't scaled before sending to window manager.
2009-05-14 12:59:40 -07:00
Marco Nelissen
fafb16c5ae Fix typo 2009-05-14 12:57:52 -07:00
Android (Google) Code Review
02c1c46fff Merge change 1674 into donut
* changes:
  gps: Time out after 1 minute if we are unable to get a fix and our fix interval is long.
2009-05-14 12:54:09 -07:00
Mike Lockwood
0632ca7bbe gps: Time out after 1 minute if we are unable to get a fix and our fix interval is long.
This will prevent us from keeping the processor awake indefinitely if a
background service is requesting periodic updates and we are unable to get a fix.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-14 15:51:03 -04:00
Romain Guy
d4103d0d14 Fix the build 2009-05-14 12:24:21 -07:00
Android (Google) Code Review
aa642c0cc2 Merge changes 1591,1596 into donut
* changes:
  Add a new feature to android.os.Debug to add the ability to inject only specific fields when calling setFieldsOn().
  Fixes #1836075. Adds consistency checks for the View hierarchy. To enable them, you need a debug build and ViewDebug.sConsistencyCheckEnabled set to true in debug.prop. This change also lets you easily enable drawing and layout profiling in ViewRoot by setting ViewRoot.sProfileDrawing, ViewRoot.sProfileLayout and ViewRoot.sShowFps in debug.prop with a debug build.
2009-05-14 11:59:33 -07:00
Android (Google) Code Review
d47d81a4de Merge change 1622 into donut
* changes:
  Fix typos.
2009-05-14 11:12:54 -07:00
Cary Clark
8f9ff7e77f remove isClick parameter in browser touch event handler
isClick is always set to true by the callers, so remove
it and simplify the code
(http://b/issue?id=1666780; see also change in external/webkit)
2009-05-14 10:14:23 -04:00
Joe Onorato
290bb011c5 Get the backup calling through to the file backup helper.
This includes some cleanup to make the parameters match
between BackupService.onBackup and FileBackupHelper.performBackup.
2009-05-14 09:39:32 -04:00
Android (Google) Code Review
ec2d74d40f Merge change 1545 into donut
* changes:
  Add Intent.ACTION_APP_ERROR
2009-05-14 03:26:16 -07:00
Dianne Hackborn
f0885c7794 am b910811: am 5d6d773: AI 148824: Fix issue #1851541 (sharedUserId requ
Merge commit 'b91081113692acc87ae67f235956ae1cecab68cc'

* commit 'b91081113692acc87ae67f235956ae1cecab68cc':
  AI 148824: Fix issue #1851541 (sharedUserId requests not being checked for matching signatures on .apk).
2009-05-13 18:15:19 -07:00
Dianne Hackborn
b910811136 am 5d6d773: AI 148824: Fix issue #1851541 (sharedUserId requests not bei
Merge commit '5d6d773fab559fdc12e553d60d789f3991ac552c' into donut

* commit '5d6d773fab559fdc12e553d60d789f3991ac552c':
  AI 148824: Fix issue #1851541 (sharedUserId requests not being checked for matching signatures on .apk).
2009-05-13 18:13:17 -07:00
Dianne Hackborn
5d6d773fab AI 148824: Fix issue #1851541 (sharedUserId requests not being checked for matching signatures on .apk).
To address issues where we could leave half-installed applications around if there was a failure during the install, we split getPackageLP() into two phases: the first would create the record, and only after doing all verification checks would we call insertPackageSettingLP() to do the remaining part of the original implementation and actually insert the record into the data structures.
  Unfortunately it was only in insertPackageSettingLP() that we would set the sharedUser field of the PackageSetting structure, so when before that we went to verify certificates, we didn't think it had requested a shared user ID, and let it through without checking.
  This fix simply sets the sharedUser field when the PackageSetting structure is first created, so we will actually check against its certs.  We still also set this again in insertPackageSettingLP(), but there is no harm in this because the only time we call this function is in that big install func, which just passes in the same shared user that it had when first getting the package.
  BUG=1851541

Automated import of CL 148824
2009-05-13 18:09:56 -07:00
Ken Shirriff
60b88edea7 Fix typos. 2009-05-13 17:51:37 -07:00
Android (Google) Code Review
560d210225 am c4cdc7d: Merge change 1611 into donut
Merge commit 'c4cdc7d8a1a42f0ce6e28c39f70cfceeee29a781'

* commit 'c4cdc7d8a1a42f0ce6e28c39f70cfceeee29a781':
  Replace the search dialog images so that they correctly center
2009-05-13 17:43:49 -07:00
Android (Google) Code Review
a3c36cceed am 2b52b3e: Merge change 1610 into donut
Merge commit '2b52b3ed46c50befcc1111ad0f4afe294a878b22'

* commit '2b52b3ed46c50befcc1111ad0f4afe294a878b22':
  Revert dividers back to their original translucent versions but add new opaque dividers to improve the speed of lists.
2009-05-13 17:43:49 -07:00
Android (Google) Code Review
c4cdc7d8a1 Merge change 1611 into donut
* changes:
  Replace the search dialog images so that they correctly center the microphone and magnifying glass (they were all off by 1 pixel).
2009-05-13 17:35:11 -07:00
Android (Google) Code Review
2b52b3ed46 Merge change 1610 into donut
* changes:
  Revert dividers back to their original translucent versions but add new opaque dividers to improve the speed of lists.
2009-05-13 17:34:15 -07:00