Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,998 Commits 3 Branches 0 Tags
243a28ba2d58acea96a33cd6c73cb805a653863f
Commit Graph

28998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
243a28ba2d am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo 
* commit '4e4d0d5f207421b0a2ce134fe17d7c78defc9dac':
  Doc change: Update uses-feature and permissions docs.
 2010-11-02 17:47:20 -07:00
Dirk Dougherty
4e4d0d5f20 am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo 
* commit '36a1bcee76d35636b4050674eb98285c3a3a6c2f':
  Doc change: Update uses-feature and permissions docs.
 2010-11-02 17:43:54 -07:00
Dirk Dougherty
36a1bcee76 Merge "Doc change: Update uses-feature and permissions docs." into froyo 2010-11-02 17:40:27 -07:00
Dirk Dougherty
f1e134ba6a Doc change: Update uses-feature and permissions docs. 
Change-Id: I80b45840d83e0622a7b5efeed00a3c659d80ca9b
 2010-11-02 17:37:23 -07:00
Brad Fitzpatrick
f3a6b90191 am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements" 
* commit '9df48a0305818122298a86ae9949f6688814928b':
  NotificationManager: droiddoc documentation improvements
 2010-11-02 15:00:06 -07:00
Gloria Wang
a8d7b7477d am ef8a810b: Merge "Update of DRM framework" 
* commit 'ef8a810b3b11d177a64111125eaa44bb76624414':
  Update of DRM framework
 2010-11-02 14:59:51 -07:00
Brad Fitzpatrick
9df48a0305 Merge "NotificationManager: droiddoc documentation improvements" 2010-11-02 14:55:21 -07:00
Nick Pelly
6fb9316f6b am 38e561dd: Merge "Remove timeout support." into gingerbread 
* commit '38e561dd3cd72160035d8b3002fc9bbaf3071374':
  Remove timeout support.
 2010-11-02 14:49:35 -07:00
Nick Pelly
38e561dd3c Merge "Remove timeout support." into gingerbread 2010-11-02 14:46:46 -07:00
Gloria Wang
ef8a810b3b Merge "Update of DRM framework" 2010-11-02 14:45:02 -07:00
Jean-Baptiste Queru
c91e46730d am bbd212d7: Merge "Document per-implementation behaviors of native get* methods" 
* commit 'bbd212d77852be155a815a0d2ad1da0df2c0dfe1':
  Document per-implementation behaviors of native get* methods
 2010-11-02 14:18:07 -07:00
Jean-Baptiste Queru
0b5d57ab7e am 715f8610: Merge "Clarify documentation of Cursor get* methods." 
* commit '715f86107763ee95e7d6558dd8da390a63da63e2':
  Clarify documentation of Cursor get* methods.
 2010-11-02 14:18:02 -07:00
Nick Pelly
275708c82c Remove timeout support. 
The implementation was guarenteed to cause deadlock when a timeout was set.

Change-Id: I59444ea784eb9057c6c4c9e9123f558b3ef5eef6
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-11-02 16:13:52 -05:00
Gloria Wang
cf393faaa8 Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-11-02 14:05:13 -07:00
Gloria Wang
35a4f21bd6 resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp 
Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
 2010-11-02 14:02:59 -07:00
Jean-Baptiste Queru
bbd212d778 Merge "Document per-implementation behaviors of native get* methods" 2010-11-02 13:27:36 -07:00
Joe Malin
fcea62a64c am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread 
* commit 'c1fad4a2e39ca5d5f2dbb45a67686f3423b8fe2d':
  DOC CHANGE: Add entry for monkeyrunner to tools index page.
 2010-11-02 13:18:47 -07:00
Joe Malin
c1fad4a2e3 Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread 2010-11-02 13:17:16 -07:00
Jean-Baptiste Queru
715f861077 Merge "Clarify documentation of Cursor get* methods." 2010-11-02 13:11:56 -07:00
Raphael
19ed73ae7f am 46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gingerbread 
* commit '46468dde8d7f9bd42ad180c2882bff6ef98685cd':
  Support for <compatible-screens><screen> in ADT.
 2010-11-02 11:45:07 -07:00
Raphael
46468dde8d Merge "Support for <compatible-screens><screen> in ADT." into gingerbread 2010-11-02 11:43:11 -07:00
Gilles Debunne
a090d64ac1 am 18149c47: Merge "Rescaled/updated mdpi assets added." into gingerbread 
* commit '18149c47bfc87c88798e6820d7153e588b374ed3':
  Rescaled/updated mdpi assets added.
 2010-11-02 10:08:27 -07:00
Gilles Debunne
51b9cc04e8 am 94da7f98: Merge "Rescaled/updated mdpi assets added." into gingerbread 
* commit '94da7f983cc33d10bf1560bb32ec19400437a42a':
  Rescaled/updated mdpi assets added.
 2010-11-02 10:05:55 -07:00
Gilles Debunne
18149c47bf Merge "Rescaled/updated mdpi assets added." into gingerbread 2010-11-02 10:05:52 -07:00
Gilles Debunne
94da7f983c Merge "Rescaled/updated mdpi assets added." into gingerbread 2010-11-02 10:04:40 -07:00
Daniel Trebbien
adf4194458 Document per-implementation behaviors of native get* methods 
Change-Id: I5d20d7796b85ce62750dd50dd79e47d76716b24c
 2010-11-02 09:35:12 -07:00
Daniel Trebbien
65068b099e Clarify documentation of Cursor get* methods. 
Make clear in the Javadoc comments of the `Cursor` get* methods that
implementations thereof can have implementation-defined behavior. In some cases,
these changes actually correct the documentation. For example, in the case of
`getShort` and the `SQLiteCursor` implementation thereof, non-numeric data is
*not* converted to a `short` via Short#valueOf or even in a functionally-
equivalent manner.

Change-Id: Ib2f81811a603680b52fc482eb9c0f3195447566f
 2010-11-02 09:24:07 -07:00
Jeff Brown
7ab5d2d951 am a87ea46c: Fix bugs related to cheek event suppression. 
* commit 'a87ea46cb023763e0a9b0222da20b0a354f79d8d':
  Fix bugs related to cheek event suppression.
 2010-11-01 21:02:05 -07:00
Jeff Brown
a87ea46cb0 Fix bugs related to cheek event suppression. 
Two issues:

1. First, due to an inverted conditional in the input dispatcher, we were
   reporting touches as long touches and vice-versa to the power manager.

2. Power manager user activity cheek event suppression also suppresses touch
   events (but not long touch or up events).  As a result, if cheek event
   suppression was enabled, touches would not poke the user activity timer.
   However due to the above logic inversion, this actually affected long
   touches.  Net result, if cheek suppression was enabled in the power manager
   and you held your thumb on the screen long enough, the phone would
   go to sleep!

Cheek event suppression is commonly turned on when making a phone call.
Interestingly, it does not seem to get turned off afterward...

This change fixes the logic inversion and exempts touches from the cheek
suppression.  The reason we do the latter is because the old behavior
was actually harmful in other ways too: a touch down would be suppressed
but not a long touch or the touch up.  This would cause bizarre behavior
if you touched the screen while it was dimmed.  Instead of brightening
immediately, it would brighten either when you lifted your finger or
300ms later, whichever came first.

Bug: 3154895
Change-Id: Ied9ccec6718fbe86506322ff47a4e3eb58f81834
 2010-11-01 20:51:58 -07:00
Gloria Wang
c1c45a4dc9 Merge "- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled." 2010-11-01 20:38:51 -07:00
Neal Nguyen
424963ef8d am 5dda76a7: Adding some StorageManager integration test infrastructure and some basic tests. 
* commit '5dda76a72e8bb4630fb5fd38a42e7bceb5b9c954':
  Adding some StorageManager integration test infrastructure and some basic tests.
 2010-11-01 19:42:22 -07:00
Neal Nguyen
5dda76a72e Adding some StorageManager integration test infrastructure and some basic tests. 
More interesting tests to come in the form of host-based tests.

Change-Id: Ifdedf7ef26ed9889871c902af20164df0498cf07
 2010-11-01 18:21:21 -07:00
Neal Nguyen
af35b8f432 am bd06f02d: Cleaning up some more flakiness in DownloadManager tests. 
* commit 'bd06f02d02e07ca15e420ee9e50e35253646ba64':
  Cleaning up some more flakiness in DownloadManager tests.
 2010-11-01 17:41:24 -07:00
Joe Malin
6c49981d51 DOC CHANGE: Add entry for monkeyrunner to tools index page. 
Change-Id: I6487521c3ab7cdf641242598dee6e2752f46fa7a
 2010-11-01 17:19:40 -07:00
Gilles Debunne
dde799deb2 Rescaled/updated mdpi assets added. 
Change-Id: Idce2f1a3fb66565abe2c710281dab1ec6650d0c2
 2010-11-01 17:18:10 -07:00
Gilles Debunne
8cfaaa7919 Rescaled/updated mdpi assets added. 
Change-Id: Ifd179b6850e04a785aef588c2f0f4fd80fc5c8fe
 2010-11-01 17:01:56 -07:00
Neal Nguyen
bd06f02d02 Cleaning up some more flakiness in DownloadManager tests. 
A couple of logic fixes (synchronization, poll time), and adding a little more test
logging info.

Change-Id: I8da71f87fd1e211913f84ec517762dca81f87292
 2010-11-01 17:00:17 -07:00
Joe Malin
ea8400b448 am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool 
* commit 'a7fda21c8298d8f316564280d702206147207005':
  DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
 2010-11-01 16:30:59 -07:00
Joe Malin
a7fda21c82 DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool 
Change-Id: I049c5f70c47077c51fefbae32633592e80068df2
 2010-11-01 16:12:54 -07:00
Gloria Wang
eab18ea34d - Move the business rule management down to DRM agents. 
- Do not register DRM sniffer because drmserver is not enabled.

Change-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f
 2010-11-01 16:12:16 -07:00
Dan Bornstein
ab1b304bd4 am ccb75a88: Merge "Update the API file." into gingerbread 
* commit 'ccb75a882f670f8928f13a485c0c29b8b8b93af3':
  Update the API file.
 2010-11-01 16:09:44 -07:00
Dan Bornstein
ccb75a882f Merge "Update the API file." into gingerbread 2010-11-01 16:08:14 -07:00
Takeshi Aimi
c7b3ccc564 Update of DRM framework 
- Overload openDecryptSession() with uri parameter
   in order to accept URI of DRM content,
   Following API is added,
       DecryptHandle*openDecryptSession(const char* uri);.
 - Unify texisting three event types of processDrmInfo()
   so that caller of DRM framework does not have to handle many event types.
 - Let DrmManagerService call load/unload plugins API so that
   client of DRM framework does not have to manage plug-in load/unload.
 - Trivial fix in DrmManagerClient.java is also incorporated.

Changes are made by Sony Corporation.

Change-Id: If62b47fa0360718fdc943e6e6143671d7db26adc
 2010-11-02 08:06:06 +09:00
Scott Main
e06bdead5d am fea07c60: am eda78cea: docs: update dashboard 
* commit 'fea07c60963abc5caaf5a59b99936d79aa9fc1b9':
  docs: update dashboard
 2010-11-01 16:00:43 -07:00
Scott Main
fea07c6096 am eda78cea: docs: update dashboard 
* commit 'eda78ceaffb234c37b11e69602d020e4bb28ca83':
  docs: update dashboard
 2010-11-01 15:57:38 -07:00
Scott Main
eda78ceaff docs: update dashboard 
Change-Id: Icf0c2076484f4aed2d3bf3fc24b751e14eeeafe1
 2010-11-01 15:10:06 -07:00
Leon Scroggins
553812178a am 3073646f: Merge "Update insertion handler for WebTextView." into gingerbread 
* commit '3073646f61dcbbfe5c9e65b8e3a1d9266c3f7276':
  Update insertion handler for WebTextView.
 2010-11-01 14:51:00 -07:00
Leon Scroggins
3073646f61 Merge "Update insertion handler for WebTextView." into gingerbread 2010-11-01 14:49:47 -07:00
Dan Bornstein
bc19c7bdc0 Update the API file. 
My previous change was api-compatible, but some of the incidental data
in the API file (like parameter names) changed. It looks like there
were probably a couple other similar changes too, that hadn't
previously been propagated to the API file; all I did to generate this
change was say "make update-api".

Change-Id: I427a9ceb51212fde515df007613b8687b7228ce7
 2010-11-01 14:14:37 -07:00
Jean-Baptiste Queru
41c738849c am 5b4d0e84: Merge "TabWidget orientation" 
* commit '5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630':
  TabWidget orientation
 2010-11-01 13:30:49 -07:00