13715 Commits

Author SHA1 Message Date
Dianne Hackborn
7e9f4eb260 Track client requests through location manager.
This fixes a problem where applications could ask the location
manager to do very heavy-weight things (like...  say... update
location every minute), which would get accounted against the
system instead of the application because ultimately it is the
system making the heavy calls (wake locks, etc).

To solve this, we introduce a new class WorkSource representing
the source of some work.  Wake locks and Wifi locks allow you
to set the source to use (but only if you are system code and thus
can get the permission to do so), which is what will be reported
to the battery stats until the actual caller.

For the initial implementation, the location manager keeps track
of all clients requesting periodic updates, and tells its providers
about them as a WorkSource param when setting their min update time.
The network location provider uses this to set the source on the
wake and wifi locks it acquires, when doing work because of the
update period.

This should also be used elsewhere, such as in the GPS provider,
but this is a good start.

Change-Id: I2b6ffafad9e90ecf15d7c502e2db675fd52ae3cf
2010-09-13 14:20:48 -07:00
Romain Guy
f4cae9f944 Merge "Forces windows to draw the first time they show." 2010-09-13 12:53:21 -07:00
Romain Guy
58ef7fbf16 Forces windows to draw the first time they show.
Change-Id: I239572ee49bc60f30d957f548104e75844859a93
2010-09-13 12:52:37 -07:00
Jaikumar Ganesh
0522f5e9b7 am cc5494c9: Out Of Band API for Secure Simple Pairing.
Merge commit 'cc5494c9996f809e36539b24e8b6b67683383d29' into gingerbread-plus-aosp

* commit 'cc5494c9996f809e36539b24e8b6b67683383d29':
  Out Of Band API for Secure Simple Pairing.
2010-09-13 11:52:19 -07:00
Shimeng (Simon) Wang
4de4f09e8e am fbd26467: Merge "DO NOT MERGE" into gingerbread
Merge commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64' into gingerbread-plus-aosp

* commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64':
  DO NOT MERGE
2010-09-13 11:51:55 -07:00
Chris Palmer
f5aafff485 Unbreak the build.
Just a quick fix. Will properly re-add @deprecated and update-api next, and
then get API approval.

Change-Id: Idf57a33dc97bc2619cf48509f74d9e0de935124b
2010-09-13 11:40:44 -07:00
Jaikumar Ganesh
cc5494c999 Out Of Band API for Secure Simple Pairing.
Change-Id: I54ded27ab85d46eef3d2cca84f2394b1ffe88ced
2010-09-13 11:40:21 -07:00
Shimeng (Simon) Wang
ba15633a22 Merge "Accessibility support for WebViews" 2010-09-13 11:06:33 -07:00
Shimeng (Simon) Wang
dc9f2b6668 DO NOT MERGE
Use a static variable and methods for the current WebView.

sJavaBridge may not exist by the time onWindowFocusChanged is called.
To avoid an NPE, just static methods that modify a global field.
JWebCoreJavaBridge is a global object anyway so using a static field
will be fine.  To avoid any garbage collection issues, store the
WebView in a WeakReference.

Bug: 2908023
Change-Id: I05e9261f2c3d13c10c73c9b34f3aeea1d12a08a6
2010-09-13 10:47:58 -07:00
Chris Palmer
ed35d0ee85 Merge "Correct the PackageManager.checkSignatures documentation." 2010-09-13 10:39:04 -07:00
Svetoslav Ganov
585f13f8de Accessibility support for WebViews
Change-Id: Ibb139192bae4d60fd53a7872b19c06312bb41558
2010-09-13 10:21:34 -07:00
Eric Fischer
569a57dc01 Merge "Import revised translations." 2010-09-13 10:04:58 -07:00
Jeff Brown
19c9c7cc6d am fb8116f7: am c891d2b3: Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread
Merge commit 'fb8116f736f2df6d1b2f8044541390a9fd9953cb'

* commit 'fb8116f736f2df6d1b2f8044541390a9fd9953cb':
  Fix PointerLocationView when pointer ids are not zero-based.
2010-09-12 20:50:16 -07:00
Jeff Brown
fb8116f736 am c891d2b3: Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread
Merge commit 'c891d2b3529b9cf24ef4781a585cd4784815e711' into gingerbread-plus-aosp

* commit 'c891d2b3529b9cf24ef4781a585cd4784815e711':
  Fix PointerLocationView when pointer ids are not zero-based.
2010-09-12 20:47:50 -07:00
Jeff Brown
c891d2b352 Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread 2010-09-12 20:45:31 -07:00
Mike Lockwood
0c7d077e9a Merge changes I68379740,I9053218f
* changes:
  MediaFile: Add support for some popular non-media file types.
  Media scanner support for tracking files of arbitrary type.
2010-09-12 20:41:07 -07:00
Jeff Brown
d1e0c371a6 Fix PointerLocationView when pointer ids are not zero-based.
Since we support using driver-provided pointer ids (ABS_MT_TRACKING_ID)
there is no guarantee that pointer ids will necessarily start from 0
or be contiguous.

Change-Id: I9609b7a3bb238d7edbcbd68cc839dd6d14baf9df
2010-09-12 20:40:51 -07:00
Mike Lockwood
c37255d5d0 Media scanner support for tracking files of arbitrary type.
The native media scanner no longer filters files based on file extension.
Audio, video, image and playlist files are handled as before, but non-media
files are now inserted into the "files" table, which was originally added
to support MTP.

Change-Id: I9053218fb6d2671a3bb181405c34442b94678afc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-12 23:21:44 -04:00
Kenny Root
cec7eb1c07 am 8b11f30c: am 1bece432: Make nativeLibraryDir visible in the API
Merge commit '8b11f30cb2cfe9922439e8a032311de114ce4da4'

* commit '8b11f30cb2cfe9922439e8a032311de114ce4da4':
  Make nativeLibraryDir visible in the API
2010-09-12 19:34:30 -07:00
Kenny Root
8b11f30cb2 am 1bece432: Make nativeLibraryDir visible in the API
Merge commit '1bece4320c1d2308b4a5b5aeda47b065312b3053' into gingerbread-plus-aosp

* commit '1bece4320c1d2308b4a5b5aeda47b065312b3053':
  Make nativeLibraryDir visible in the API
2010-09-12 19:31:45 -07:00
Kenny Root
1bece4320c Make nativeLibraryDir visible in the API
Change-Id: Ic88e76a85b0041e97b4c29c42dfa09db0356391c
2010-09-12 19:20:32 -07:00
Steve Howard
df10a19296 am f353daa0: am 90fb15a7: Support UI visibility and restarting in download manager.
Merge commit 'f353daa03aeb3c04fdfa87b7bcd49f0a7eea59b1'

* commit 'f353daa03aeb3c04fdfa87b7bcd49f0a7eea59b1':
  Support UI visibility and restarting in download manager.
2010-09-12 19:14:42 -07:00
Steve Howard
f353daa03a am 90fb15a7: Support UI visibility and restarting in download manager.
Merge commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0' into gingerbread-plus-aosp

* commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0':
  Support UI visibility and restarting in download manager.
2010-09-12 19:11:08 -07:00
Steve Howard
90fb15a7e5 Support UI visibility and restarting in download manager.
First, this change adds a column to the downloads table specifying
whether a download should be displayed in the system downloads UI.  It
adds a public method to set this parameter when requesting a download,
and a hidden method to filter queries based on this paramter (such
filtering could be made public later, but it's not strictly necessary
right now).

Second, this change adds support for restarting a completed/failed
download as a hidden method on DownloadManager.  Currently it only
works from the download manager's process - it'll be used by the new
download manager UI.

Change-Id: I15eda1a6e3717d1ce947a810b25ad3540cce809e
2010-09-12 18:58:55 -07:00
Adam Powell
cf78b3e510 Add support for custom action views in ActionBar menus
Change-Id: Ic7850bc00fcfe95d805dd6a1b15cb5d413942475
2010-09-12 18:33:44 -07:00
Kenny Root
5d8b320428 am 1361a5bd: am 07a9e8d3: Merge changes Ie3648509,I53db73c3 into gingerbread
Merge commit '1361a5bd1eba1cae16c301622324153c3d50b84c'

* commit '1361a5bd1eba1cae16c301622324153c3d50b84c':
  Move native library removal function to helper
  Initialize native library path in PackageSetting
2010-09-12 18:06:07 -07:00
Kenny Root
1361a5bd1e am 07a9e8d3: Merge changes Ie3648509,I53db73c3 into gingerbread
Merge commit '07a9e8d39f818e54f0feccff10c99b9629007a64' into gingerbread-plus-aosp

* commit '07a9e8d39f818e54f0feccff10c99b9629007a64':
  Move native library removal function to helper
  Initialize native library path in PackageSetting
2010-09-12 18:02:47 -07:00
Dianne Hackborn
7f01c01a67 Merge "Some fragment stuff:" 2010-09-12 18:00:25 -07:00
Kenny Root
07a9e8d39f Merge changes Ie3648509,I53db73c3 into gingerbread
* changes:
  Move native library removal function to helper
  Initialize native library path in PackageSetting
2010-09-12 17:59:41 -07:00
Romain Guy
2bffd268f1 Fix text rendering issue with text scaling.
Change-Id: I1f3ae40025697e8f8ca0616ee6550fe215cadcc8
2010-09-12 17:59:13 -07:00
Jeff Brown
eb851c4ecf am e740dd0c: am 69206512: Fix some API discrepancies in InputEvent.
Merge commit 'e740dd0c8fde910066f9ddf83b4ab094ed95eaf9'

* commit 'e740dd0c8fde910066f9ddf83b4ab094ed95eaf9':
  Fix some API discrepancies in InputEvent.
2010-09-12 17:24:29 -07:00
Jeff Brown
e740dd0c8f am 69206512: Fix some API discrepancies in InputEvent.
Merge commit '692065128e66de77470de2c50ead2bef0452952a' into gingerbread-plus-aosp

* commit '692065128e66de77470de2c50ead2bef0452952a':
  Fix some API discrepancies in InputEvent.
2010-09-12 17:21:18 -07:00
Jeff Brown
692065128e Fix some API discrepancies in InputEvent.
Change-Id: I8e33e125e10075d6f256a1eb3dd46990f35074d6
2010-09-12 17:17:30 -07:00
Jeff Brown
b3787d57ff am 0f0541e4: am b88102f5: Input dispatcher ANR handling enhancements.
Merge commit '0f0541e40cfef51eb5c3769e53c1aa853b53aaf6'

* commit '0f0541e40cfef51eb5c3769e53c1aa853b53aaf6':
  Input dispatcher ANR handling enhancements.
2010-09-12 17:15:19 -07:00
Dianne Hackborn
3e449ce00e Some fragment stuff:
Fix issue #2975886: Make getTargetFragment() survive rotation events with
retained fragments.  We now fix up the fragment pointer when restoring state.

Fix issue #2919928: In PreferenceFragment, addPreferencesFromResources() is
not effective when called after onActivityCreated().  Note to self: do not use
a what code of 0.  Maybe that should be documented (I'll do it in gingerbread).

Hopefully implement #2992753: DialogFragment.dismiss will NPE if called too soon
(before attached to activity).  We now keep track of the FragmentManager
separately from the activity, and set that as soon as the fragment is part of a
transaction.

Investigate issue #2988876: NPE when device orientation is changed.  The NPE is
because of the app trying to do a fragment transaction in onPause().  This is
fundamentally not viable, since (a) the activity will be gone before we ever
have a chance to process the message to commit the transaction, and (b) even if
we did try to commit the transaction earlier, this would be done after
onSaveInstanceState() and thus not work in cases where the activity gets killed
in the background.  So instead, we'll just throw an immediate exception if you
try to do this.

Change-Id: Iea62b50eb79f066af2471fce86836d073398f4f7
2010-09-12 17:10:04 -07:00
Jeff Brown
0f0541e40c am b88102f5: Input dispatcher ANR handling enhancements.
Merge commit 'b88102f5b7e51552a3576cf197b4c8cf96f193d1' into gingerbread-plus-aosp

* commit 'b88102f5b7e51552a3576cf197b4c8cf96f193d1':
  Input dispatcher ANR handling enhancements.
2010-09-12 17:05:38 -07:00
Daisuke Miyakawa
2f76176045 Fix typo.
onnSaveInstanceState -> onSaveInstanceState

Change-Id: I34981dd10fce4eaad6e1f6bba3d569e1e35e3c2a
2010-09-12 16:53:17 -07:00
Jeff Brown
b88102f5b7 Input dispatcher ANR handling enhancements.
This change is essentially a rewrite of the main input dispatcher loop
with the target identification folded in.  Since the input dispatcher now
has all of the window state, it can make better decisions about
when to ANR.

Added a .5 second deadline for processing app switch keys.  This behavior
predates Gingerbread but had not previously been ported.

Fixed some timing inaccuracies in the ANR accounting that could cause
applications to ANR sooner than they should have.

Added a mechanism for tracking key and motion events that have been
dispatched to a window so that appropriate cancelation events can be
synthesized when recovering from ANR.  This change helps to keep
applications in sync so they don't end up with stuck buttons upon
recovery from ANRs.

Added more comments to describe the tricky parts of PollLoop.

Change-Id: I13dffca27acb436fc383980db536abc4d8b9e6f1
2010-09-12 16:52:03 -07:00
Adam Powell
2a5a53709e Fix broken ActionMode close button styling
Change-Id: I425df1433d43c1b2bd392464ed10142532640f81
2010-09-12 15:51:18 -07:00
Adam Powell
c7b29fbb3e Merge "Fix a bug that could cause improper detection of long press selection mode in WebView after a scale gesture" 2010-09-12 14:19:46 -07:00
Adam Powell
0a8bf86413 Fix a bug that could cause improper detection of long press selection mode in WebView after a scale gesture
Change-Id: I171ccad91ddc7e7983664dbf52d3104508493538
2010-09-12 14:17:46 -07:00
Joe Onorato
c66f16ec41 Merge "Connect my plumbing to dsandler's awesome lights out mode." 2010-09-12 14:07:04 -07:00
Joe Onorato
f63b0f44eb Connect my plumbing to dsandler's awesome lights out mode.
It took a little bit of refactoring to move the authoritative state
about whether the lights are on or not into the StatusBarManagerService,
so that if the system ui process crashes, the bar comes up in the
right mode.

Change-Id: I95cfaf8f78ca4443ded5262272ea755d44dc5d17
2010-09-12 17:06:01 -04:00
Romain Guy
e4e0a4bca0 am 7d5c0e66: am 15f0a79a: Merge "fix typo in comment @beamsOverlap"
Merge commit '7d5c0e660e52888f986acef2cecde8ddc9ca26c8'

* commit '7d5c0e660e52888f986acef2cecde8ddc9ca26c8':
  fix typo in comment @beamsOverlap
2010-09-12 14:01:08 -07:00
Brad Fitzpatrick
42a5ed2015 resolved conflicts for merge of 171c83f4 to master
Change-Id: I56a4c1838b17cf40d96763f95df3c84fc86359eb
2010-09-12 13:55:18 -07:00
Adam Powell
806b717bf5 Merge "resolved conflicts for merge of 12e08f3a to master" 2010-09-12 13:14:16 -07:00
Adam Powell
be36668499 resolved conflicts for merge of 12e08f3a to master
Change-Id: Ic691ec7716d5c450406717d3748847cb9c6b7e82
2010-09-12 12:47:04 -07:00
Romain Guy
ae44d554b7 Merge "Correct implementation of saveLayer()." 2010-09-12 12:25:13 -07:00
Romain Guy
f607bdc167 Correct implementation of saveLayer().
Change-Id: I5375126636913e0a84f2d6bbd0ebe40d2e4f2763
2010-09-12 12:24:12 -07:00
Romain Guy
7d5c0e660e am 15f0a79a: Merge "fix typo in comment @beamsOverlap"
Merge commit '15f0a79a81fd18211603587bcd46eee0e37ced4d' into gingerbread-plus-aosp

* commit '15f0a79a81fd18211603587bcd46eee0e37ced4d':
  fix typo in comment @beamsOverlap
2010-09-12 12:01:54 -07:00