drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,898 Commits 1 Branch 0 Tags
Commit Graph

49898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
79f407cc6c Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI 
Change-Id: Ib847213f566dee79126d7c14d00750a9a8dedeb9
 2011-05-05 15:11:23 -07:00
James Dong
8b1b0548b2 Merge "Clean up JNI code" 2011-05-05 12:49:37 -07:00
James Dong
17524dc0d2 Clean up JNI code 
o Move the Set/Map/Iterator calls from JNI to Java
o The JNI function receives arrays instead of Maps
o Removed Set/Iterator calls from the Java code as suggested

Change-Id: I34068bf24b61abaf2833dad1f65abc733ed760dd
 2011-05-05 11:20:55 -07:00
Gilles Debunne
9de128ef79 Merge "Off by one bug in TextView's suggestions popup." 2011-05-05 10:08:59 -07:00
Alex Sakhartchouk
19c5c7a7bc Merge "Code Cleanup and better Sampler creation method" 2011-05-05 09:38:00 -07:00
Alex Sakhartchouk
4f413e413d Merge "save benchmark results" 2011-05-05 09:37:07 -07:00
Scott Main
b47c18a505 am 4f034f70: am 475917c7: am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1 
* commit '4f034f70d473c8c737977898f18d54caccf99a17':
  docs: update homepage to announce 3.1
 2011-05-05 09:02:35 -07:00
Scott Main
4f034f70d4 am 475917c7: am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1 
* commit '475917c7e4002c42cdf668eabc1a04f604a82005':
  docs: update homepage to announce 3.1
 2011-05-05 08:54:07 -07:00
Scott Main
475917c7e4 am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1 
* commit 'e6746acde2a0cc4faad9bdec026a9554797e2f94':
  docs: update homepage to announce 3.1
 2011-05-05 08:43:42 -07:00
Scott Main
e6746acde2 Merge "docs: update homepage to announce 3.1" into honeycomb-mr1 2011-05-05 08:33:03 -07:00
Chet Haase
ed30fd8e9a Add ability for hierarchyviewer to output displaylist info 
Clicking on a node in hierarchyviewer1 and hierarchyviewer2 and then
clicking the new "Dump DisplayList" button will cause the display
list for the selected node (including its children) to be output into
logcat.

Change-Id: Iad05f5f6cca0f8b465dccd962b501dc18fe6e053
 2011-05-05 07:35:40 -07:00
Steve Block
098b781699 Merge "Log an error message if WebView methods are called on the wrong thread." 2011-05-05 04:36:27 -07:00
Steve Block
51b0891038 Log an error message if WebView methods are called on the wrong thread. 
All public WebView methods should be called on the UI thread. This
change adds a check to all public non-inherited methods, other than
those that have always been hidden.

Bug: 4373919
Change-Id: I573fc704faa58287a7b14a971958fa5417855d70
 2011-05-05 12:31:05 +01:00
Irfan Sheriff
33bf60a3fc am 86654eda: am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures 
* commit '86654eda96b005ea21bfe4d29cd042187e497a8f':
  Handle GET_POWER failures
 2011-05-04 21:22:29 -07:00
Irfan Sheriff
86654eda96 am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures 
* commit '8a14d8b9c03c611cabde5743cfdcc9ff51314550':
  Handle GET_POWER failures
 2011-05-04 21:19:19 -07:00
Irfan Sheriff
8a14d8b9c0 am 1a5b6098: Handle GET_POWER failures 
* commit '1a5b6098d5002ae07ce3f9bc514400a87c2b64fa':
  Handle GET_POWER failures
 2011-05-04 21:14:47 -07:00
Chet Haase
a17de9b493 Revert "Add ability for hierarchyviewer to output displaylist info" 
This reverts commit b2a4b52e8d5e499d33e2765e8c47851bf0266299.
 2011-05-04 18:23:12 -07:00
Joe Onorato
f2a4568afc Merge "Fix race conditions in WakeLocks." 2011-05-04 18:13:10 -07:00
Joe Onorato
d7350e3a56 Fix race conditions in WakeLocks. 
Bug: 3439332
Change-Id: I70c583e6a73960df8faad69675947b87642c6228
 2011-05-04 18:10:19 -07:00
Irfan Sheriff
28baf6f096 Merge "Add basic walled garden check" 2011-05-04 17:58:04 -07:00
Jeff Sharkey
2a2dc6894a Merge "Return NetworkStats bundle from NM service." 2011-05-04 17:49:01 -07:00
Alex Sakhartchouk
a89094aa3b Code Cleanup and better Sampler creation method 
Change-Id: I9e35081ee6034cb619f43a47f8f22f38977f5d12
 2011-05-04 17:45:36 -07:00
Chet Haase
42a3a39e23 Merge "Add ability for hierarchyviewer to output displaylist info" 2011-05-04 17:30:30 -07:00
Chet Haase
b2a4b52e8d Add ability for hierarchyviewer to output displaylist info 
Clicking on a node in hierarchyviewer1 and hierarchyviewer2 and then
clicking the new "Dump DisplayList" button will cause the display
list for the selected node (including its children) to be output into
logcat.

Change-Id: Id32f62569ad1ab4d533bc62987f3a7390c1bb4e6
 2011-05-04 17:18:27 -07:00
Wink Saville
600fc592e7 am ece6eb56: am 676db0d3: Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE 
* commit 'ece6eb5625ac8b597f60d67f30f431ea13f237a5':
  Fix 4379712 NPE in GsmDataConnectionTracker
 2011-05-04 17:06:46 -07:00
Robert Ly
d1e58d5d02 am 796ba68b: am 2246bc66: am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1 
* commit '796ba68b73fa93ae290cf85b264183ffcfa45eba':
  doc change: a misplaced link removed
 2011-05-04 17:04:50 -07:00
Wink Saville
ece6eb5625 am 676db0d3: Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE 
* commit '676db0d301caf4fa64c2c1b8427fe2efd5cc7811':
  Fix 4379712 NPE in GsmDataConnectionTracker
 2011-05-04 17:04:19 -07:00
Robert Ly
796ba68b73 am 2246bc66: am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1 
* commit '2246bc665d09e8f8e1dc35702fbe76e8bb270d56':
  doc change: a misplaced link removed
 2011-05-04 17:02:26 -07:00
Wink Saville
676db0d301 Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE 2011-05-04 17:01:32 -07:00
Robert Ly
2246bc665d am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1 
* commit '7157b7c31462e9340847d15d936bbb0b1117ecbb':
  doc change: a misplaced link removed
 2011-05-04 17:00:10 -07:00
Robert Greenwalt
a9faac5554 am 5673c13b: am aacd80fd: Fix build break. 
* commit '5673c13b51bc4719d9a1afceb1aeb4743e86e230':
  Fix build break.
 2011-05-04 16:59:47 -07:00
Robert Ly
7157b7c314 Merge "doc change: a misplaced link removed" into honeycomb-mr1 2011-05-04 16:55:59 -07:00
Robert Greenwalt
5673c13b51 am aacd80fd: Fix build break. 
* commit 'aacd80fd87bc08c410853a044967c8f7b417f089':
  Fix build break.
 2011-05-04 16:55:26 -07:00
Robert Greenwalt
aacd80fd87 Fix build break. 
Change-Id: Ic61448f468fb97a2ae032bf5782b33ed8972e20f
 2011-05-04 16:50:10 -07:00
Robert Ly
d834113247 doc change: a misplaced link removed 
Change-Id: If8b12e5409b44a095593b126a18fa6c0d572cc59
 2011-05-04 16:41:40 -07:00
Jeff Sharkey
9a13f36cdd Return NetworkStats bundle from NM service. 
Introduce NetworkStats which is a collection of network statistics,
which should match the structure communicated by kernel module through
netd.  Will introduce tags and fg/bg stats later.  Kept entirely in a
flat data structure to optimize parcel speed.

Initial pass at returning NetworkStats from NetworkManagementService,
both summary and details.  Will eventually pull data from kernel module
over netd connection.

Change-Id: I92d9f61678ec8c22e2ce26775fb035a0cf32413f
 2011-05-04 16:07:21 -07:00
Katie McCormick
588f280fe0 am cfb91777: am 7d513652: am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340 
* commit 'cfb917770a063174dc188c28200d31c206e0bbfc':
  Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
 2011-05-04 15:51:53 -07:00
Katie McCormick
cfb917770a am 7d513652: am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340 
* commit '7d513652380ec4e1760e1f253d3630e4fdeb0ee5':
  Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
 2011-05-04 15:49:17 -07:00
Katie McCormick
7d51365238 am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340 
* commit '62922c361e0c1b36c3787d7f06d04c3a609c2b12':
  Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
 2011-05-04 15:47:10 -07:00
Katie McCormick
62922c361e Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340 
Change-Id: I9633f380f701bfa63453c9e969eeb0236a37894e
 2011-05-04 15:34:28 -07:00
Joe Onorato
b3aeb3ec4f Merge "If there is no hdmi available, still record that hdmi is not plugged in." 2011-05-04 15:29:15 -07:00
Joe Onorato
7ba631f8b7 If there is no hdmi available, still record that hdmi is not plugged in. 
Bug: 4321927
Change-Id: I583b75477914f6ec0d6cb8c3d6775063202e1dbe
 2011-05-04 15:28:00 -07:00
Scott Main
48a880bc49 am bcac77ec: am f9e9452c: am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions 
* commit 'bcac77ec5c86dda8bacf3ab7c2c5a5597bf6cbd2':
  cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
 2011-05-04 15:23:31 -07:00
Scott Main
bcac77ec5c am f9e9452c: am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions 
* commit 'f9e9452c2d6482a8181f6edb32f5c53bff10aa59':
  cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
 2011-05-04 15:20:03 -07:00
Wink Saville
ed2989a9e1 Fix 4379712 NPE in GsmDataConnectionTracker 
Releasing the apnContext too soon and move getting the dc and dcac
into the ok path.

Bug: 4379712
Change-Id: I0296b65ec5842b0219269a73d48ac39086c382fd
 2011-05-04 15:16:12 -07:00
Scott Main
f9e9452c2d am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions 
* commit 'ad3b87aa0d094c3e867ce44ec3f61e0b02090417':
  cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
 2011-05-04 15:09:53 -07:00
Scott Main
ad3b87aa0d cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 
docs: update dashboard for platform versions

Change-Id: I21ddf27d0ad5bba817f6995ae716c6dc1029c0a5
 2011-05-04 15:03:38 -07:00
Joe Onorato
523ca2ba6d Merge "Rename ViewRoot to ViewAncestor." 2011-05-04 14:52:37 -07:00
Scott Main
f2902588c6 am e9091efe: am bb4ffd45: am 41703766: docs: typo in menu doc 
* commit 'e9091efe44f75795fdbad46ef9393d886de806d9':
  docs: typo in menu doc
 2011-05-04 14:48:10 -07:00
Scott Main
e9091efe44 am bb4ffd45: am 41703766: docs: typo in menu doc 
* commit 'bb4ffd45c833a59882706bd53fde3b04bf4dc441':
  docs: typo in menu doc
 2011-05-04 14:44:23 -07:00