Commit Graph

9415 Commits

Author SHA1 Message Date
Kenny Root
02ca31fbae Add OBB flags to support overlays
* Add flags field in OBB footer to support overlays.

* Remove unused 'crypto' and 'filesystem' fields in obbtool (could
  later be supported in the "flags" field of the OBB footer).

* Add notes to document OBB classes before shipping.

Change-Id: I386b43c32c5edef55210acb5d3322639c08010ba
2010-08-18 09:34:58 -07:00
Steve Howard
baf3869b88 Merge "Fix up handling of null fields in DownloadManager." into gingerbread 2010-08-18 09:03:34 -07:00
Svetoslav Ganov
3dfaf21dfc DO NOT MERGE 2928156 Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)
Change-Id: I18437d98032487329b6b9b579ed12abbfb77501f
2010-08-17 19:03:56 -07:00
Daisuke Miyakawa
f996ed9f2e Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread 2010-08-17 16:42:06 -07:00
Daisuke Miyakawa
b7688558cc Make vCard importer/exporter aware of multi-byte parameters.
Bug: 2922186
Change-Id: Ic877940242d87ef918bf8d4dac601d37b296259b
2010-08-17 16:40:47 -07:00
Steve Howard
8651bd5d18 Fix up handling of null fields in DownloadManager.
Document fields that can have invalid/unknown values, and fix handling
of null local URI.

Change-Id: I7684c151f0a20c91340655246bec2ce0a60328e4
2010-08-17 14:10:25 -07:00
Wu-cheng Li
f008f3ea82 Document that autoFocus must be called in auto and macro mode.
Change-Id: Ia52f8bc8a75a7473edff50326a4a0467f4295e6a
2010-08-17 13:44:35 -07:00
Brad Fitzpatrick
67fed01522 Avoid unnecessary SharedPrefences disk writes.
Apps commonly edit + commit redundant changes to their
SharedPreferences, not checking the existing values.  Rather than
force all apps to double-check that their settings writes aren't
redundant, we should just make .commit() faster (avoiding the disk
write) when the file already exists on disk and no effective changes
were made.

Change-Id: I7edbd0d3ace5b69b7af6d12c39797c8b7f86230b
2010-08-17 10:29:15 -07:00
Steve Howard
ab59914de7 am b3e957bb: Merge "New download manager error code when we can\'t resume." into gingerbread
Merge commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28' into gingerbread-plus-aosp

* commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28':
  New download manager error code when we can't resume.
2010-08-17 08:27:17 -07:00
Steve Howard
b3e957bb9d Merge "New download manager error code when we can't resume." into gingerbread 2010-08-17 08:20:52 -07:00
Mathias Jeppsson
8534a8e438 Crash when powering off.
Fixing a race condition. If "confirm" is true and the shutdown
dialog is shown it may take some time before the user presses the
ok button. During this time a new call to shutdown may be made with
confirm=false. When this happens the shutdown thread is started by
the second call, and later when the users presses the ok button. This
results in ShutdownThread.beginShutdownSequence() being called
twice. I.e., the beginShutdownSequence lacks the proper protection
for this error case.

Change-Id: Ib9b01c5a43f4dc23de09057f3fc1507000317faf
2010-08-17 13:33:09 +02:00
Mathias Agopian
98a94989dd am 833533c9: Improve Display javadoc slightly
Merge commit '833533c9292f860e4dfc060a4eba6429cd259ed4' into gingerbread-plus-aosp

* commit '833533c9292f860e4dfc060a4eba6429cd259ed4':
  Improve Display javadoc slightly
2010-08-16 16:54:49 -07:00
Steve Howard
33bbd12a05 New download manager error code when we can't resume.
Adding DownloadManager.ERROR_CANNOT_RESUME for when we can't resume an
interrupted download (because the server didn't provide an ETag or
doesn't support range requests), as well as the necessary private
status code in Downloads.Impl.

Change-Id: I5a66f1e1964198552ab2216aa6d3cc0db2254e21
2010-08-16 14:28:17 -07:00
Mathias Agopian
833533c929 Improve Display javadoc slightly
Change-Id: Iaa7d599e11d42d4aaf50e87b141f9b8d04ba445e
2010-08-16 13:30:20 -07:00
Doug Zongker
bb33d6fd98 am 997dc32b: Merge "add an api for getting a device serial number" into gingerbread
Merge commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934' into gingerbread-plus-aosp

* commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934':
  add an api for getting a device serial number
2010-08-16 13:20:05 -07:00
Doug Zongker
997dc32b6b Merge "add an api for getting a device serial number" into gingerbread 2010-08-16 09:19:40 -07:00
Doug Zongker
7d2e3df60d add an api for getting a device serial number
Add a constant to android.os.Build that returns a device-specific
alphanumeric serial number.  It's optional -- it may be blank --
though CTS will require it to be present for non-telephony devices.

Change-Id: I338ae5f43ba679a5e98f2f437dc4efdaef0c835d
2010-08-16 09:18:50 -07:00
Dianne Hackborn
2e47052fc4 am 567722ee: Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread
Merge commit '567722eee190f7cf88dc7ea95167db76d5514842' into gingerbread-plus-aosp

* commit '567722eee190f7cf88dc7ea95167db76d5514842':
  Fix problems with determining when to kill apps for wake usage.
2010-08-15 17:34:49 -07:00
Dianne Hackborn
567722eee1 Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread 2010-08-15 17:33:02 -07:00
Dianne Hackborn
1ebccf531d Fix problems with determining when to kill apps for wake usage.
Also improve debug printing of various times.

Change-Id: Ifcc288fd1bcbf44c069875ba97925b9e7ffe9a48
2010-08-15 17:27:29 -07:00
Robert Greenwalt
993f85f319 am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into gingerbread
Merge commit 'e300b8c10c306b575bbbec29d5572ba92a97785e' into gingerbread-plus-aosp

* commit 'e300b8c10c306b575bbbec29d5572ba92a97785e':
  DO NOT MERGE Always set/remove default routes.
2010-08-13 16:03:29 -07:00
Dianne Hackborn
66b0343e9e am a8d9291d: Merge "Various battery info things:" into gingerbread
Merge commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177' into gingerbread-plus-aosp

* commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177':
  Various battery info things:
2010-08-13 16:00:44 -07:00
Robert Greenwalt
e300b8c10c Merge "DO NOT MERGE Always set/remove default routes." into gingerbread 2010-08-13 15:59:53 -07:00
Robert Greenwalt
b738fb9938 DO NOT MERGE Always set/remove default routes.
Must clean up default route if a default 3g connection is replaced
by a non-default (ie, mms) connection on teh same interface.

Also stop mucking with all connections dns and routes - do it only
for the connection that has changed.

bug:2865974
Change-Id: Ifdf49080fa0413a4d826813706c809975a562dfa
2010-08-13 15:53:13 -07:00
Herb Jellinek
a473394183 BluetoothHeadset.java:
Added ACTION_VENDOR_SPECIFIC_HEADSET_EVENT,
EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD,  EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_ARGS.

BluetoothAssignedNumbers.java (new file):
A home for BT assigned numbers, beginning with the company IDs.

HeadsetBase.java:
Reformatted some code.

AtCommandHandler.java:
Fixed comment typos.

Change-Id: I34d6f248166305d72be66632779fc963b894379c

Added EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_COMPANY_ID.
Fixed a minor comment typo.

Change-Id: I8550692c13510a853c894b2d108bef4520d931c2
2010-08-13 15:23:00 -07:00
Dianne Hackborn
9adb9c3b10 Various battery info things:
- Now track wake locks in battery history.
- Now track sensors in battery history.
- Some filtering of sensory data.
- Fixes to some data that wasn't cleared when resetting battery stats.
- Print amount discharged since last charge.

And the big part -- keep track of wake locks held per process,
and kill processes that hold wake locks too much while they are in
the background.  This includes information in the battery stats
about the process being killed, which will be available to the
developer if the app is reported.

Change-Id: I97202e94d00aafe0526ba2db74a03212e7539c54
2010-08-13 15:17:49 -07:00
Wu-cheng Li
77a473fbce am ccaa0028: Merge "Improve camera documentation." into gingerbread
Merge commit 'ccaa002848e9ef1ff232eee5babc9273599924af' into gingerbread-plus-aosp

* commit 'ccaa002848e9ef1ff232eee5babc9273599924af':
  Improve camera documentation.
2010-08-12 14:05:56 -07:00
Wu-cheng Li
699fe93979 Improve camera documentation.
Change-Id: I3c9e5e6de5ce64b8d7d892483930238fa9cc247c
2010-08-12 14:00:14 -07:00
John Huang
edfe20c4bd am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"
Merge commit 'c636b846160482fbebd9a3792d52b9ff864228f2' into gingerbread-plus-aosp

* commit 'c636b846160482fbebd9a3792d52b9ff864228f2':
  Enhance WspTypeDecoder to decode Content Type Parameters
2010-08-12 10:26:58 -07:00
Jeff Brown
4e14159a04 am bb65ae02: Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread
Merge commit 'bb65ae020f802bae3e80dd8e05845fee5d6bc2cb' into gingerbread-plus-aosp

* commit 'bb65ae020f802bae3e80dd8e05845fee5d6bc2cb':
  Fix ViewRoot bug attempting to finish synthetic KeyEvents.
2010-08-11 17:26:16 -07:00
Jeff Brown
f66f8a58cc am 95af0c14: Merge "Add support for the PointerLocation overlay." into gingerbread
Merge commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066' into gingerbread-plus-aosp

* commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066':
  Add support for the PointerLocation overlay.
2010-08-11 16:18:36 -07:00
Jeff Brown
92ff1dd835 Fix ViewRoot bug attempting to finish synthetic KeyEvents.
Bug: 2834068
Change-Id: I34ee0c4479cee36b25a2c3e1cdf5d761b663ac1e
2010-08-11 16:18:13 -07:00
Jeff Brown
95af0c14a6 Merge "Add support for the PointerLocation overlay." into gingerbread 2010-08-11 16:15:48 -07:00
Jeff Brown
a41ca77fab Add support for the PointerLocation overlay.
This change involves adding a new method to IWindowManager,
monitorInput() that returns an InputChannel to receive a copy of all
input that is dispatched to applications.  The caller must have
the READ_INPUT_STATE permission to make this request (similar to
other window manager methods such as getKeycodeState).

Change-Id: Icd14d810174a5b2928671ef16de73af88302aea0
2010-08-11 14:46:32 -07:00
Kenny Root
f5ee5358c1 am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread
Merge commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e' into gingerbread-plus-aosp

* commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e':
  Move OBB file reading to DefaultContainerService
2010-08-11 14:10:18 -07:00
Kenny Root
a02b8b05dd Move OBB file reading to DefaultContainerService
The system_server shouldn't touch files on the SD card. This change
moves the things that touch the SD card out to the
DefaultContainerService so that it will get killed if the SD card goes
away instead of the system_server.

Change-Id: I0aefa085be4b194768527195532ee6dddc801cfc
2010-08-11 11:20:53 -07:00
Patrick Scott
dc1f08586e am 9902196f: Fix npe in getCacheTotalSize.
Merge commit '9902196f9885d369e37cf44084e3f04513511ab0' into gingerbread-plus-aosp

* commit '9902196f9885d369e37cf44084e3f04513511ab0':
  Fix npe in getCacheTotalSize.
2010-08-11 07:18:27 -07:00
Patrick Scott
9902196f98 Fix npe in getCacheTotalSize.
Bug: 2882277
Change-Id: I9319a48e0ed75561d3d04691fb288f69d11edc84
2010-08-11 09:48:43 -04:00
Dianne Hackborn
679ac09a5c am a5ae50cd: Merge "More native work." into gingerbread
Merge commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb' into gingerbread-plus-aosp

* commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb':
  More native work.
2010-08-11 00:47:51 -07:00
Dianne Hackborn
08d5b8fad8 More native work.
Implement save/restore of state, and add native APIs for
configuration information.

Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
2010-08-11 00:29:59 -07:00
Konstantin Lopyrev
8279c754d1 am 91a7f5fe: Making sure that the prefix is handled properly.
Merge commit '91a7f5fef8a9fc496acef23f513cb48139e8dff5' into gingerbread-plus-aosp

* commit '91a7f5fef8a9fc496acef23f513cb48139e8dff5':
  Making sure that the prefix is handled properly.
2010-08-10 19:02:51 -07:00
Konstantin Lopyrev
91a7f5fef8 Making sure that the prefix is handled properly.
Change-Id: Ic50327b1ed4d6b54753b5b3887508a53cd7a3497
2010-08-10 18:54:54 -07:00
Adam Powell
e8fa85d7a1 am 224ab9a5: Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread
Merge commit '224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7' into gingerbread-plus-aosp

* commit '224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7':
  Fix public bug http://code.google.com/p/android/issues/detail?id=10067
2010-08-10 17:54:58 -07:00
Konstantin Lopyrev
f00ee0f762 am f39d5987: Merge "Categorizing exported view properties." into gingerbread
Merge commit 'f39d5987b977fdff8c34a2ddabaec31d1e909db3' into gingerbread-plus-aosp

* commit 'f39d5987b977fdff8c34a2ddabaec31d1e909db3':
  Categorizing exported view properties.
2010-08-10 17:52:32 -07:00
Adam Powell
224ab9a5c6 Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread 2010-08-10 17:52:15 -07:00
Adam Powell
9bccdb7d5c Fix public bug http://code.google.com/p/android/issues/detail?id=10067
Change-Id: I7b7a9a32e82fc7541beabe286b20b01f39406cc8
2010-08-10 17:50:11 -07:00
Konstantin Lopyrev
f39d5987b9 Merge "Categorizing exported view properties." into gingerbread 2010-08-10 17:48:27 -07:00
Konstantin Lopyrev
bea95162ca Categorizing exported view properties.
Change-Id: I79c42019836973d80662c21d195d088ae01537a0
2010-08-10 17:45:03 -07:00
Jeff Brown
95105f3c25 am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode().
Merge commit 'c3fc2d03d58a258c53c9265a70143d4af076b764' into gingerbread-plus-aosp

* commit 'c3fc2d03d58a258c53c9265a70143d4af076b764':
  Fix safe mode and KeyEvent.getMaxKeyCode().
2010-08-10 16:33:47 -07:00
Jeff Brown
d3cf0544cc am d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread
Merge commit 'd98d0fc6e9172d3f130794e499462c911920adf6' into gingerbread-plus-aosp

* commit 'd98d0fc6e9172d3f130794e499462c911920adf6':
  Optimize VelocityTracker to run in linear time.
2010-08-10 16:31:04 -07:00