Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,020 Commits 3 Branches 0 Tags
d9bb6bc283b3f7ee75da14c42c8a563214103c05
Commit Graph

29020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
d9bb6bc283 am 08810efc: docs: provide overview of the web apps docs and revise images in the targeting doc 
* commit '08810efc1a1868261fb042355f75ab049438b6e3':
  docs: provide overview of the web apps docs and revise images in the targeting doc
 2010-11-03 15:18:10 -07:00
Scott Main
08810efc1a docs: provide overview of the web apps docs and revise images in the targeting doc 
Change-Id: I7c7c5b1936bea0676a2cafa5020e2b997c0b8634
 2010-11-03 14:48:21 -07:00
Justin Ho
ade230ed99 am 112b5b1f: Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread 
* commit '112b5b1f304846a1f6999a8347f45dae43719b8f':
  DO NOT MERGE - Updated VPNServices stat_sys icons
 2010-11-03 13:43:09 -07:00
Justin Ho
112b5b1f30 Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread 2010-11-03 13:39:26 -07:00
Justin Ho
ccacd87a39 DO NOT MERGE - Updated VPNServices stat_sys icons 
Change-Id: I2dfb6873488460528bab68225a69cae61c215006
 2010-11-03 13:38:12 -07:00
Jeff Hamilton
1212d4fdc9 am ef569469: Merge "Remove the My Tag feature." into gingerbread 
* commit 'ef5694692f88bb91ed6ee1191b11a66ec594ff39':
  Remove the My Tag feature.
 2010-11-03 13:37:22 -07:00
Jeff Hamilton
ef5694692f Merge "Remove the My Tag feature." into gingerbread 2010-11-03 13:34:39 -07:00
Jeff Hamilton
575a6bbfe0 Remove the My Tag feature. 
Change-Id: I9167121da2fa66ddae23386d24fef7bcc64eb3f1
 2010-11-03 15:32:40 -05:00
Daniel Sandler
9f4f20c245 am 65816a32: Merge "Fix the fix for storage ANRs." into gingerbread 
* commit '65816a32ee2c2181895e3be636f3173a6e769f67':
  Fix the fix for storage ANRs.
 2010-11-03 12:38:40 -07:00
Daniel Sandler
65816a32ee Merge "Fix the fix for storage ANRs." into gingerbread 2010-11-03 12:36:31 -07:00
James Dong
a3f5b615d7 am f3847e87: Merge "DO NOT MERGE" into gingerbread 
* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
  DO NOT MERGE
 2010-11-03 09:25:08 -07:00
James Dong
f3847e875e Merge "DO NOT MERGE" into gingerbread 2010-11-03 09:21:44 -07:00
Daniel Sandler
5b8743f3d6 Fix the fix for storage ANRs. 
This repairs Icf2a836b6 to avoid an infinite loop on boot.

Bug: 3138068
Change-Id: Ic3a0455e18002dfb82774d96b3467030c4b15e2f
 2010-11-03 09:49:26 -04:00
Dianne Hackborn
0ce0f72c1e am 906b830d: Revert "UMS: Avoid SystemUI ANRs during long vold operations." 
* commit '906b830d1d61cbd8b1f9c2dc87e564cfb0f315fd':
  Revert "UMS: Avoid SystemUI ANRs during long vold operations."
 2010-11-02 22:28:10 -07:00
Dianne Hackborn
906b830d1d Revert "UMS: Avoid SystemUI ANRs during long vold operations." 
This reverts commit 010704f95d.
 2010-11-02 22:23:53 -07:00
Daniel Sandler
1df8765ac0 am cbc3219d: Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread 
* commit 'cbc3219d2864a0b8d8ee6cda2c0b9a679bdeb200':
  UMS: Avoid SystemUI ANRs during long vold operations.
 2010-11-02 20:35:17 -07:00
Daniel Sandler
cbc3219d28 Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread 2010-11-02 20:34:10 -07:00
James Dong
6786fccf5a DO NOT MERGE 
Fix premature release of recording frames when physical address or metadata is stored in input video buffers

- bug 3158459

Change-Id: If297189d2a87fc3abfda68c29ac75b490b30a902
 2010-11-02 19:30:01 -07:00
Jason parks
bcbf17a582 am 73eba2a6: Merge "Return a zero length byte from toByteArray instead of null." into gingerbread 
* commit '73eba2a6bcf39eb20d815517ed11e1a7fb7a2c39':
  Return a zero length byte from toByteArray instead of null.
 2010-11-02 19:00:12 -07:00
Jason parks
73eba2a6bc Merge "Return a zero length byte from toByteArray instead of null." into gingerbread 2010-11-02 18:58:09 -07:00
Daniel Sandler
010704f95d UMS: Avoid SystemUI ANRs during long vold operations. 
Stop handling StorageEventListener callbacks on the main
thread, where calls back into StorageManager could take a
while (i.e., during a long fsck).

Bug: 3138068
Change-Id: Icf2a836b69ff60606edce7c5575ad64dc24698c6
 2010-11-02 21:47:22 -04:00
Jason parks
3ebd59bb5d Return a zero length byte from toByteArray instead of null. 
Change-Id: I67b388099c72a0d2ec6b429caea8f29bf8f7a75a
 2010-11-02 20:03:52 -05:00
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