22726 Commits

Author SHA1 Message Date
Robert Greenwalt
e6b205bbf2 am 8987f110: am c2093636: am 7171ea81: Make ThrottleService more tamper resistant. 2010-04-18 12:43:11 -07:00
Robert Greenwalt
8987f110c6 am c2093636: am 7171ea81: Make ThrottleService more tamper resistant.
Merge commit 'c2093636db6141426ca7fe88f07b30a284e36759' into kraken

* commit 'c2093636db6141426ca7fe88f07b30a284e36759':
  Make ThrottleService more tamper resistant.
2010-04-18 12:35:10 -07:00
Robert Greenwalt
c2093636db am 7171ea81: Make ThrottleService more tamper resistant.
Merge commit '7171ea8179e09270e4d6ab825a2320816eee39c5' into froyo-plus-aosp

* commit '7171ea8179e09270e4d6ab825a2320816eee39c5':
  Make ThrottleService more tamper resistant.
2010-04-18 12:27:03 -07:00
Robert Greenwalt
7171ea8179 Make ThrottleService more tamper resistant.
Use elapsed time not wall time for alarms so users can't play with the
system time to get around things.

Also using NTP servers to pull in an authoritative time - if we the build
is configured with an NTP server we will not advance to the next cycle
without it, but we also will not trottle - rather not throttle users
on an error.

Note that the poll alarm is just relative to the last poll time and real
time doesn't matter.

Defining the time-fetching API's as returning time in the system wallclock
range (correcting if we are using NTP time internally).

bug:2597530
Change-Id: I1c0ac0923314c2f8a04edd0b36c4845352eae99a
2010-04-18 10:21:20 -07:00
Mike Lockwood
48358bd5c1 Fix inconsistency in how we handle light sensor when battery is low.
In lightSensorChangedLocked we ignore the light sensor if the battery is low.
But in applyButtonState() and applyKeyboardState() we were still using the previous
mLightSensorScreenBrightness value, which resulted in a race condition that could
leave the button lights on after the screen turns off.
Now we ignore the light sensor value and button brightness override if the battery
is low so the low battery behavior is consistent.

Change-Id: I4943f8904299883211a95596ee207df69d1eaea2
BUG: 2570962

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-17 22:29:20 -04:00
Irfan Sheriff
d0af6819be am c2477a92: am 2572b046: am 975d86df: Merge "Dont check on interface value on API" into froyo 2010-04-17 09:44:58 -07:00
Irfan Sheriff
c2477a924f am 2572b046: am 975d86df: Merge "Dont check on interface value on API" into froyo
Merge commit '2572b046d64a2d0b43d74870e1e899364f2bc721' into kraken

* commit '2572b046d64a2d0b43d74870e1e899364f2bc721':
  Dont check on interface value on API
2010-04-17 09:36:44 -07:00
Irfan Sheriff
2572b046d6 am 975d86df: Merge "Dont check on interface value on API" into froyo
Merge commit '975d86dfc6407314491a18bc715c8c95a8f8f0b1' into froyo-plus-aosp

* commit '975d86dfc6407314491a18bc715c8c95a8f8f0b1':
  Dont check on interface value on API
2010-04-17 09:31:19 -07:00
Irfan Sheriff
975d86dfc6 Merge "Dont check on interface value on API" into froyo 2010-04-17 09:27:25 -07:00
Svetoslav Ganov
af7adab3e3 2604184 Expose hidden APIs for testing the AccessibilityManager separately from the backing AccessibilityManagerServcie
Change-Id: Ief5df31baa3c0990467625977e97cd066a671959
2010-04-16 18:19:33 -07:00
Raphael
69df817eea Fix aapt to build in Windows SDK under Linux
Change-Id: Ic4a7b9e4df5b32bc338547a2a9d09b834ebaff14
2010-04-16 17:59:09 -07:00
Grace Kloba
5a2e428ce8 am eb94c44c: am 17e36d23: am 3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo 2010-04-16 17:22:51 -07:00
Scott Main
69bda63275 resolved conflicts for merge of 45703007 to master
Change-Id: Ib340803fe7ff4bea79d873a5f58ca3202889c7d3
2010-04-16 17:20:05 -07:00
Irfan Sheriff
cf28236b37 Dont check on interface value on API
The interface check in API could be used
in future.

Bug: 2576057
Change-Id: Icfb78a88be44d1e6a8350c4b65efe70970e658d8
2010-04-16 16:53:20 -07:00
Grace Kloba
eb94c44c0f am 17e36d23: am 3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo
Merge commit '17e36d233dff7178e60d841a650d9bef5d0af93c' into kraken

* commit '17e36d233dff7178e60d841a650d9bef5d0af93c':
  Missed a case to resumeUpdatePicture.
2010-04-16 16:40:54 -07:00
Jean-Michel Trivi
a99f5f43cd Fix bug 2599698 Music paused by itself
The NotificationPlayer sets an OnCompletionListener on the
MediaPlayer it's using to play the notification.
NotificationPlayer relies on the completion event to abandon
audio focus.
 The player was started before the listener was set. The theory
about the bug is that the player finished playing before the listener
was called. Therefore the audio focus was never abandonned, and
the music didn't resume.

Change-Id: Ic3baf359ea24de0d832a655dc47e745b25bc3dec
2010-04-16 16:40:47 -07:00
Grace Kloba
17e36d233d am 3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo
Merge commit '3c44db3f67c1f0bf82191ba77ca479c0e7fede34' into froyo-plus-aosp

* commit '3c44db3f67c1f0bf82191ba77ca479c0e7fede34':
  Missed a case to resumeUpdatePicture.
2010-04-16 16:38:25 -07:00
Grace Kloba
3c44db3f67 Merge "Missed a case to resumeUpdatePicture." into froyo 2010-04-16 16:34:43 -07:00
Scott Main
4570300713 am 71786ceb: am 0df87c06: Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo
Merge commit '71786ceb8ce91d209b974f899e7f9c66f57afacd' into kraken

* commit '71786ceb8ce91d209b974f899e7f9c66f57afacd':
  cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54
2010-04-16 16:21:58 -07:00
Scott Main
71786ceb8c am 0df87c06: Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo
Merge commit '0df87c0653fc9e8425643a10cd71594a962fab8d' into froyo-plus-aosp

* commit '0df87c0653fc9e8425643a10cd71594a962fab8d':
  cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54
2010-04-16 16:17:55 -07:00
Scott Main
0df87c0653 Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo 2010-04-16 16:14:33 -07:00
Vasu Nori
20f549fd2f several minor bugs and things listed below
bug:1648729
   print warning if a requery is attemped on main thread
bug:2459293
   browser death because of NoSuchElementException. don't use iterator
   to march thru the ArrayList. use old style for() loop.
bug:1609474
   don't allow downgrades of databases
other stuff
   use LRUcache to maintain statement-cache in SQLiteDatabase
Change-Id: I3a42022162f4dfcc75f7d0cfcad8f20f1d193249
2010-04-16 15:50:41 -07:00
Grace Kloba
aa373c9868 Missed a case to resumeUpdatePicture.
Fix http://b/issue?id=2603882
2010-04-16 15:49:36 -07:00
The Android Open Source Project
0d8d70bba4 am 81a47198: am a9ea147d: merge from open-source master 2010-04-16 15:26:01 -07:00
The Android Open Source Project
81a4719856 am a9ea147d: merge from open-source master
Merge commit 'a9ea147dc204cd3eed7ed99f8b7d6464c7f740bf' into kraken

* commit 'a9ea147dc204cd3eed7ed99f8b7d6464c7f740bf':
  Unify am startservice commands.
2010-04-16 15:21:38 -07:00
The Android Open Source Project
a9ea147dc2 merge from open-source master
Change-Id: I050a2b6f3d09f079a50491aeabb86b242a59d647
2010-04-16 15:18:28 -07:00
Vasu Nori
3bf1e8220a am 99d43435: am 66bee813: am 1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo 2010-04-16 15:04:16 -07:00
Vasu Nori
99d43435b6 am 66bee813: am 1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo
Merge commit '66bee81321f16a3268adc43f5f87fcfbf8c27290' into kraken

* commit '66bee81321f16a3268adc43f5f87fcfbf8c27290':
  accept close() on database objects even if the database is closed
2010-04-16 14:57:26 -07:00
Vasu Nori
66bee81321 am 1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo
Merge commit '1fc46c623f9af8aaccfd519ece78331d9a95e579' into froyo-plus-aosp

* commit '1fc46c623f9af8aaccfd519ece78331d9a95e579':
  accept close() on database objects even if the database is closed
2010-04-16 14:53:32 -07:00
Vasu Nori
1fc46c623f Merge "accept close() on database objects even if the database is closed" into froyo 2010-04-16 14:48:47 -07:00
Vasu Nori
0dbb9cee58 accept close() on database objects even if the database is closed
bug:2602878
Change-Id: I3075f801ef35d72792ff3daaa1e887e53b58f5f8
2010-04-16 14:24:57 -07:00
Carl Shapiro
0c745a0d89 am 49ee271b: am cb2906e4: am d5a873fb: Merge "Add command line flags to enable lock profiling." into froyo 2010-04-16 13:38:57 -07:00
Carl Shapiro
49ee271bba am cb2906e4: am d5a873fb: Merge "Add command line flags to enable lock profiling." into froyo
Merge commit 'cb2906e4bbb96b0be83029572a78f97dc6763eca' into kraken

* commit 'cb2906e4bbb96b0be83029572a78f97dc6763eca':
  Add command line flags to enable lock profiling.
2010-04-16 13:31:39 -07:00
Carl Shapiro
cb2906e4bb am d5a873fb: Merge "Add command line flags to enable lock profiling." into froyo
Merge commit 'd5a873fbe8df67e86990969b6729db0079bbc278' into froyo-plus-aosp

* commit 'd5a873fbe8df67e86990969b6729db0079bbc278':
  Add command line flags to enable lock profiling.
2010-04-16 13:28:23 -07:00
Carl Shapiro
d5a873fbe8 Merge "Add command line flags to enable lock profiling." into froyo 2010-04-16 13:25:03 -07:00
The Android Open Source Project
ee3f00f71a am ffeeed9c: am 329a5214: merge from open-source master 2010-04-16 12:57:33 -07:00
Jean-Baptiste Queru
69acb6b746 Unify am startservice commands.
This replaces the implementation with an equivalent one.

Change-Id: I1343ddee9414a67906cd426b8381ddbace873894
2010-04-16 12:55:48 -07:00
Jake Hamby
f69e897649 Merge "Spelling corrections and other minor cosmetic cleanups." 2010-04-16 12:52:31 -07:00
The Android Open Source Project
ffeeed9c5c am 329a5214: merge from open-source master
Merge commit '329a52141c52e15caf4f0dba1735857c4ef4d478' into kraken

* commit '329a52141c52e15caf4f0dba1735857c4ef4d478':
  Allow Am to start services
2010-04-16 12:50:54 -07:00
The Android Open Source Project
329a52141c merge from open-source master
Change-Id: I93512089253f00b3da1e31f8b5f4d6e72fae8dc4
2010-04-16 12:46:21 -07:00
Mike Reed
6758a1dd6b am 3edf3a56: am e0a40686: am f066611a: retool resize logic to use max dimension and max area. 2010-04-16 12:35:26 -07:00
Mike Reed
3edf3a567e am e0a40686: am f066611a: retool resize logic to use max dimension and max area.
Merge commit 'e0a4068640cff64abcd3a70395ad461919b15ea6' into kraken

* commit 'e0a4068640cff64abcd3a70395ad461919b15ea6':
  retool resize logic to use max dimension and max area.
2010-04-16 12:26:52 -07:00
Mike Reed
e0a4068640 am f066611a: retool resize logic to use max dimension and max area.
Merge commit 'f066611aab5758b7b2a6b4a525e3f85aa813064a' into froyo-plus-aosp

* commit 'f066611aab5758b7b2a6b4a525e3f85aa813064a':
  retool resize logic to use max dimension and max area.
2010-04-16 12:24:09 -07:00
Mike Reed
f066611aab retool resize logic to use max dimension and max area.
Change-Id: I32446b41afe9e7c241868c0cb7b9b7d9056b2d38
http://b/issue?id=2598253
2010-04-16 15:19:02 -04:00
Mike LeBeau
3c43c5cfb2 am 5fee638e: am f04be52a: am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo 2010-04-16 07:36:13 -07:00
Mike LeBeau
5fee638e4b am f04be52a: am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo
Merge commit 'f04be52a382544ff8006e227c1578a219ba0f23e' into kraken

* commit 'f04be52a382544ff8006e227c1578a219ba0f23e':
  For search suggestions in the search dialog, allow the 'title'
2010-04-16 07:30:18 -07:00
Mike LeBeau
f04be52a38 am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo
Merge commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a' into froyo-plus-aosp

* commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a':
  For search suggestions in the search dialog, allow the 'title'
2010-04-16 07:27:34 -07:00
Mike LeBeau
0c5ad4f1b3 Merge "For search suggestions in the search dialog, allow the 'title' line of text to be up to 2 lines (rather than the usual 1) if no 'description' line is provided." into froyo 2010-04-16 07:23:12 -07:00
Leon Scroggins III
ae9f8e4abd Request focus when MotionEvent.ACTION_UP is received.
Bug 2585857

Change-Id: I2e852d2225db4d1ba48815354a31e0823e4d3a8d
2010-04-16 09:23:08 -04:00
Carl Shapiro
d8f3ec6e83 Add command line flags to enable lock profiling. 2010-04-15 22:42:17 -07:00