Commit Graph

2613 Commits

Author SHA1 Message Date
Android (Google) Code Review
7642e3418e am 3d3e307a: Merge change 3126 into donut
Merge commit '3d3e307a63144b1bddd534fefd35a557223d52bf'

* commit '3d3e307a63144b1bddd534fefd35a557223d52bf':
  Fix thread safety in DataConnectionTracker.
2009-06-04 22:41:38 -07:00
Karl Rosaen
d0c3a61b07 am 320b2eee: SearchDialog should only do DialogCursorProtocol stuff when in global search mode.
Merge commit '320b2eeeea426dc06f7bb7f37c3d795babeb6adb'

* commit '320b2eeeea426dc06f7bb7f37c3d795babeb6adb':
  SearchDialog should only do DialogCursorProtocol stuff when in global search mode.
2009-06-04 22:41:22 -07:00
Jack Palevich
2a741ad51f Use ANSI style function declaration for RS scripts. 2009-06-04 20:16:39 -07:00
The Android Open Source Project
cc8bce50db Empty merge, thru 1c54cf0903, which are already in master
Merge commit '1c54cf0903cd81467ca41ec6733c459e10b22763'
2009-06-04 19:01:38 -07:00
Android (Google) Code Review
13755dd934 Merge change 3261
* changes:
  Add support for scripts to return an animation flag.  This allows them to indicate they are generating changing content and the rs thread to sleep if the content is static.
2009-06-04 17:59:58 -07:00
Jason Sams
a09f11d6c6 Add support for scripts to return an animation flag. This allows them to indicate they are generating changing content and the rs thread to sleep if the content is static. 2009-06-04 17:58:03 -07:00
Fred Quintana
435e427d69 fix a incorrect merge 2009-06-04 17:30:28 -07:00
Android (Google) Code Review
9600fcce65 Merge change 3216
* changes:
  Set the RS thread priority.
2009-06-04 14:45:38 -07:00
Jason Sams
8ad0010d6e Set the RS thread priority. 2009-06-04 14:35:01 -07:00
Fred Quintana
d8dfeb5ee8 - make it easier to add content values to the ContentProviderOperation
- add the group membership common kind as well as some IM utilities to the ContactsContract
2009-06-04 12:23:54 -07:00
Dmitri Plotnikov
a41d3856fa Changed aggregate_exception to aggregate_exceptions
Changed singular to plural to follow the apparent convention.
2009-06-04 10:25:49 -07:00
Android (Google) Code Review
3d3e307a63 Merge change 3126 into donut
* changes:
  Fix thread safety in DataConnectionTracker.
2009-06-04 10:09:59 -07:00
Karl Rosaen
320b2eeeea SearchDialog should only do DialogCursorProtocol stuff when in global search mode. 2009-06-04 17:59:44 +01:00
Karl Rosaen
ebb03a78ce Detect impressions, and cleanup the SearchDialog / SuggestionCursor communication.
(framework portion)

There are now 4 times the search dialog will check with the cursor:
- after data set changed
- when an item is clicked
- when the cursor is about to be closed
- when an item at a particular position is detected as showing

these are now the points where we can add data in either direction, which we use to accomplish:
- finding out whether there are any pending results
- find out if there is a position at which to notify when it is displayed (the "more results" triggering)
- toggling the "more results" button
- sending the max position that was displayed when the cursor is done

the new behavior (in addition to the refactoring) is improved detection of "more results" to trigger the additional sources
(it is now precise), and detection of which items were displayed to the user.
2009-06-04 09:57:18 -07:00
Mike LeBeau
88bd450e48 Turn off verbose logging in SearchableInfo, which seems to have been
left on by accident.
2009-06-04 09:57:18 -07:00
Bjorn Bringert
c2c0bc6a90 Remove support for bitmap icons in search suggestions.
This is no longer needed, since content providers can now return
AssetFileDescriptors for in-memory data.
Bitmaps in the suggestion cursor was resopnsible for lots of
unnecessary copying, since all rows are copied out of the database
regardless of how many are displayed in the UI.
2009-06-04 09:57:18 -07:00
Mike LeBeau
20cd73ea54 Add INTENT_ACTION_WEB_SEARCH_SETTINGS (thereby fixing the build too :)). 2009-06-04 09:57:18 -07:00
Tammo Spalink
5c6164b3ee cdma getNeighboringCids to fail with an exception 2009-06-04 09:57:18 -07:00
Christopher Tate
ce74edc7ea More backup work
* Put in some permission enforcement around agent connection notification
  and full-backup scheduling.
* Full backup now applies to any package, not just backup participants who
  have declared their own android:backupAgent
* The process of running the backup operation on the set of apps who have
  been queued for it is now done in a separate thread, with a notification
  mechanism from the main Backup Manager service to pass along new-agent
  binding knowledge.  There's no longer one do-backup message on the primary
  Handler per target application.
* The new backup thread sets up the desired transport now and passes
  along the newly backed-up data to it for each backup target.  Two
  transports have been defined so far, GoogleTransport and AdbTransport;
  both are stubs at present.

Note that at present the backup data output file seems to be properly
created, but after doBackup() is called on the test app's agent it's
still zero size.
2009-06-04 09:57:18 -07:00
Bjorn Bringert
7fb952ac23 Allow making AssetFileDescriptors from SQLite blobs.
This change adds a new class SQLiteContentHelper, which contains
a static method for creating an AssetFileDescriptor from
an SQLite query that returns a blob.

Internally, this uses a file descriptor for a MemoryFile.

The implementation is temporary. Ideally, the data should be copied
directly from SQLite to the MemoryFile ashmem region, using
sqlite3_blob_read().

This is part of the implementation of http://b/issue?id=1871731
2009-06-04 09:57:18 -07:00
Android (Google) Code Review
f6b72523e2 Merge change 3068
* changes:
  Remove handling of ENTER key from WebView.
2009-06-04 09:34:34 -07:00
Karl Rosaen
1c54cf0903 Detect impressions, and cleanup the SearchDialog / SuggestionCursor communication.
(framework portion)

There are now 4 times the search dialog will check with the cursor:
- after data set changed
- when an item is clicked
- when the cursor is about to be closed
- when an item at a particular position is detected as showing

these are now the points where we can add data in either direction, which we use to accomplish:
- finding out whether there are any pending results
- find out if there is a position at which to notify when it is displayed (the "more results" triggering)
- toggling the "more results" button
- sending the max position that was displayed when the cursor is done

the new behavior (in addition to the refactoring) is improved detection of "more results" to trigger the additional sources
(it is now precise), and detection of which items were displayed to the user.
2009-06-04 16:11:47 +01:00
Android (Google) Code Review
241b4c74aa Merge change 3149 into donut
* changes:
  Turn off verbose logging in SearchableInfo, which seems to have been left on by accident.
2009-06-04 07:08:45 -07:00
Mike LeBeau
0f7e914e87 Turn off verbose logging in SearchableInfo, which seems to have been
left on by accident.
2009-06-04 15:07:44 +01:00
Bjorn Bringert
3250fa7371 Remove support for bitmap icons in search suggestions.
This is no longer needed, since content providers can now return
AssetFileDescriptors for in-memory data.
Bitmaps in the suggestion cursor was resopnsible for lots of
unnecessary copying, since all rows are copied out of the database
regardless of how many are displayed in the UI.
2009-06-04 15:04:38 +01:00
Android (Google) Code Review
f762589d1f Merge change 3145 into donut
* changes:
  Add INTENT_ACTION_WEB_SEARCH_SETTINGS (thereby fixing the build too :)).
2009-06-04 06:10:37 -07:00
Mike LeBeau
3a27803b29 Add INTENT_ACTION_WEB_SEARCH_SETTINGS (thereby fixing the build too :)). 2009-06-04 14:09:42 +01:00
Android (Google) Code Review
c08fc64ff6 Merge change 2845 into donut
* changes:
  Allow making AssetFileDescriptors from SQLite blobs.
2009-06-04 03:09:43 -07:00
Android (Google) Code Review
df9f69dbec Merge change 1526 into donut
* changes:
  cdma getNeighboringCids to fail with an exception
2009-06-03 23:30:02 -07:00
Tammo Spalink
90cb947c22 cdma getNeighboringCids to fail with an exception 2009-06-04 14:07:13 +08:00
Android (Google) Code Review
261dbd7706 Merge change 2978
* changes:
  Adds "is_primary" and "is_super_primary" columns to DataColumns.
2009-06-03 21:23:11 -07:00
Christopher Tate
043dadc751 More backup work
* Put in some permission enforcement around agent connection notification
  and full-backup scheduling.
* Full backup now applies to any package, not just backup participants who
  have declared their own android:backupAgent
* The process of running the backup operation on the set of apps who have
  been queued for it is now done in a separate thread, with a notification
  mechanism from the main Backup Manager service to pass along new-agent
  binding knowledge.  There's no longer one do-backup message on the primary
  Handler per target application.
* The new backup thread sets up the desired transport now and passes
  along the newly backed-up data to it for each backup target.  Two
  transports have been defined so far, GoogleTransport and AdbTransport;
  both are stubs at present.

Note that at present the backup data output file seems to be properly
created, but after doBackup() is called on the test app's agent it's
still zero size.
2009-06-03 20:42:15 -07:00
Jaikumar Ganesh
9c2a3be8ba Fix thread safety in DataConnectionTracker.
All the methods in DataConnectionTracker should be called only through
the handler. Fix this as trySetupData was being called in the broadcast receiver.

Tested: Airplane mode and GPRS retry.
2009-06-03 19:09:48 -07:00
Jason Sams
33c824d17b Remove pointer hacks from script and use standard load/store functions. 2009-06-03 18:29:04 -07:00
Android (Google) Code Review
55db8aec8f am 4ee0a751: Merge change 3095 into donut
Merge commit '4ee0a751682e713d3d6ca97fa1271df12d352ee0'

* commit '4ee0a751682e713d3d6ca97fa1271df12d352ee0':
  Skip empty lines in test url list.
2009-06-03 17:02:49 -07:00
Android (Google) Code Review
4ee0a75168 Merge change 3095 into donut
* changes:
  Skip empty lines in test url list.
2009-06-03 17:01:01 -07:00
Android (Google) Code Review
a2fe677487 am 9654cba8: Merge change 3094 into donut
Merge commit '9654cba89ebf02b68bd7109df2d9f758a30fb8bf'

* commit '9654cba89ebf02b68bd7109df2d9f758a30fb8bf':
  Grant permissions to older package when deleting an updated system application.
2009-06-03 16:34:53 -07:00
Mitsuru Oshima
342d59d319 am 9189cabb: * Moved supports-density tag under manifest * Refactored Compatibility code * Added CompatibilityInfo class * Removed getApplicationScale from Context * Added Resources#getCompatibilityInfo so that RootView can get the compatibility info w/o going through Context * Expandable support * Added expandable tag under manifest * Old application w/o expandable is given the default screen size ([320, 480] x density). * The non-expandable window is centered.
Merge commit '9189cabb0b6c6c28232fe6f412b7ba7a37352a6a'

* commit '9189cabb0b6c6c28232fe6f412b7ba7a37352a6a':
  * Moved supports-density tag under manifest
2009-06-03 16:34:47 -07:00
Android (Google) Code Review
9654cba89e Merge change 3094 into donut
* changes:
  Grant permissions to older package when deleting an updated system application. When a system app gets updated, the permissions are granted to the new pkg. Similary when this updated pkg(from data partition) gets removed, the older pkg from system partition is restored. but the permissions are'nt being granted explicitly and so the restore fails. This fix addresses specific bugs related to uninstall of updated system apps. These code paths will be revisited later but this fix is needed for OTA's that might fall back to older versions of system apps.
2009-06-03 16:32:18 -07:00
Mitsuru Oshima
9189cabb0b * Moved supports-density tag under manifest
* Refactored Compatibility code
  * Added CompatibilityInfo class
  * Removed getApplicationScale from Context
  * Added Resources#getCompatibilityInfo so that RootView can get the compatibility info w/o going through Context
* Expandable support
  * Added expandable tag under manifest
  * Old application w/o expandable is given the default screen size  ([320, 480] x density).
  * The non-expandable window is centered.
2009-06-03 16:28:10 -07:00
Amith Yamasani
138197f961 am eaeb663b: Track activity foreground CPU usage for battery stats.
Merge commit 'eaeb663bcd7a82b654954b42663232cbd7bef7e7'

* commit 'eaeb663bcd7a82b654954b42663232cbd7bef7e7':
  Track activity foreground CPU usage for battery stats.
2009-06-03 16:21:13 -07:00
Wei Huang
e87b2f0276 add Gservices settings for adaptive heartbeat parameters and wifi heartbeat interval. 2009-06-03 16:09:59 -07:00
Android (Google) Code Review
ddb69f5c00 Merge change 3083
* changes:
  Generalize bitmap support and add remaining GL formats. Fix bug in command fifo looping case.
2009-06-03 16:05:59 -07:00
Jason Sams
e2ae85fc5a Generalize bitmap support and add remaining GL formats.
Fix bug in command fifo looping case.
2009-06-03 16:04:54 -07:00
Guang Zhu
53003de64e Skip empty lines in test url list. 2009-06-03 16:01:58 -07:00
Suchi Amalapurapu
701f5164c1 Grant permissions to older package when deleting an updated system application.
When a system app gets updated, the permissions are granted to the new pkg. Similary when this updated pkg(from data partition)
gets removed, the older pkg from system partition is restored. but the permissions are'nt being granted explicitly and so the restore fails.
This fix addresses specific bugs related to uninstall of updated system apps. These code paths will be revisited later but this fix is needed for OTA's that might
fall back to older versions of system apps.
2009-06-03 15:52:04 -07:00
Amith Yamasani
eaeb663bcd Track activity foreground CPU usage for battery stats.
Track the foreground CPU time of an activity so that we can tell if apps are
spending more time in the background compared to foreground.
Update power profile values for screen backlight and GPS.
Fix some javadoc bugs (milliseconds vs. microseconds).
2009-06-03 15:38:24 -07:00
Evan Millar
ab5742dd63 Adds "is_primary" and "is_super_primary" columns to DataColumns.
Replaces the "primary" values stored in generic data fields with
standard "is_primary" and "is_super_primary" fields in the DataColumns
class. This makes it much easier to watch for changes to these fields
and enforce the uniqueness of primary fields.
2009-06-03 15:16:58 -07:00
Mathias Agopian
3b2c69d3b5 am cede1ed3: fix [1610840] Positional light doesn\'t work correctly on emulator
Merge commit 'cede1ed3e1721dc4a697a540388ef0f4b51c60eb'

* commit 'cede1ed3e1721dc4a697a540388ef0f4b51c60eb':
  fix [1610840] Positional light doesn't work correctly on emulator
2009-06-03 15:12:30 -07:00
Android (Google) Code Review
411c77df9e am 5de674e1: Merge change 3013 into donut
Merge commit '5de674e1cbd6e43b6d7954ccacf5cd709b30265d'

* commit '5de674e1cbd6e43b6d7954ccacf5cd709b30265d':
  Adding missing callback onJsConfirm to dismiss any confirmation dialogs
  fix a bug in GL lighting where the specular component could be ommited when vertex material was disabled.
2009-06-03 15:12:28 -07:00