Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,023 Commits 3 Branches 0 Tags
bb40896e6641eb3df568042dfc169ed2013e5b0d
Commit Graph

50023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Murdoch
bb40896e66 Merge WebKit at r74534: Update browser user agent. 
Change-Id: I6959d2f1f9b69209deb255e442791f6447fe6b05
 2011-05-10 15:38:51 +01:00
Kristian Monsen
cbb59db7ee Enable platform notifications for chrome http stack 
Change-Id: I386aef25010c95b15fb6a8edc96e59e538540306
 2011-05-10 14:13:16 +01:00
James Dong
2f6a27f69d Merge "Add send session recording summary report to application" 2011-05-09 17:47:09 -07:00
Wink Saville
28e77e616d am ba54feb0: am 45364dc4: Merge "Telephony: Signal Strength Changes." into honeycomb-LTE 
* commit 'ba54feb094fdf0eb2201eae5751104a144a2a31d':
  Telephony: Signal Strength Changes.
 2011-05-09 17:04:57 -07:00
James Dong
3aea037dd8 Add send session recording summary report to application 
Change-Id: I9c63ddae432f0c93486c39776ed0a058a8649602
 2011-05-09 17:03:35 -07:00
Robert Greenwalt
9dd0cb8977 am b98b56c2: am a142512a: Broadcast SIM Refresh to all registered components 
* commit 'b98b56c21faac16cea97e8cdcba485365f86c50f':
  Broadcast SIM Refresh to all registered components
 2011-05-09 17:02:28 -07:00
Wink Saville
ba54feb094 am 45364dc4: Merge "Telephony: Signal Strength Changes." into honeycomb-LTE 
* commit '45364dc4bfe3e6118ad61f1d38489fe63418699a':
  Telephony: Signal Strength Changes.
 2011-05-09 17:02:07 -07:00
Robert Greenwalt
b98b56c21f am a142512a: Broadcast SIM Refresh to all registered components 
* commit 'a142512a5009d7b4c422d23b1d7bab8d219eb50b':
  Broadcast SIM Refresh to all registered components
 2011-05-09 16:58:52 -07:00
Wink Saville
45364dc4bf Merge "Telephony: Signal Strength Changes." into honeycomb-LTE 2011-05-09 16:57:32 -07:00
Robert Greenwalt
a142512a50 Broadcast SIM Refresh to all registered components 
There could be multiple registrants like SIM, STK.
Port of 6228 from partner repo.

Change-Id: I0756d8b69e30058409e0279f65a99a1aa091e13d
 2011-05-09 16:46:39 -07:00
Teng-Hui Zhu
b109c88771 Exit full screen support on java side 
bug:4312214

Change-Id: Id3c755db0a824d42f1f8d1a0952f63d2078d163a
 2011-05-09 14:56:19 -07:00
Robert Ly
8755cc0919 am a3838018: am 5d032390: am 27944242: am c3038308: Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1 
* commit 'a38380183329912a9d79a84ad5265c6c9dbef434':
  Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package
 2011-05-09 14:52:16 -07:00
Marco Nelissen
04f32bdfd2 Merge "Fix mode." 2011-05-09 14:49:36 -07:00
Robert Ly
a383801833 am 5d032390: am 27944242: am c3038308: Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1 
* commit '5d03239063d0c5148d920a0992da8974c6e0a8ce':
  Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package
 2011-05-09 14:47:43 -07:00
Robert Ly
5d03239063 am 27944242: am c3038308: Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1 
* commit '279442428ab1000b57273f172453b712b03cb9fd':
  Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package
 2011-05-09 14:43:28 -07:00
Robert Ly
279442428a am c3038308: Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1 
* commit 'c3038308a765de2826997b65c175bf752b45bc70':
  Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package
 2011-05-09 14:41:00 -07:00
Robert Ly
c3038308a7 Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1 2011-05-09 14:25:53 -07:00
Marco Nelissen
19399f4ed6 Fix mode. 
Change-Id: I94813a4a73ea3a7b11e0747fda479be87e697072
 2011-05-09 14:06:57 -07:00
Marco Nelissen
f470ced7cd Merge "When using O_CREAT, the mode should be specified." 2011-05-09 13:03:43 -07:00
Marco Nelissen
d868913728 When using O_CREAT, the mode should be specified. 
Change-Id: Id364072fce62388eba47207a97800eb185480633
 2011-05-09 12:46:56 -07:00
Robert Ly
4d86bd32a6 Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package 
Change-Id: I941e708a70b48dba2da4aa3d186824c89ebfb22f
 2011-05-09 12:37:01 -07:00
James Dong
78fed171d9 Add const to the finders method in MetaData.cpp 
o also fixed the MPEG4Writer writeFtypBox() to take a const pointer to MetaData

Change-Id: Iaecdbe6aeab345f6dc72aac0d19f9704b6e0d28a
 2011-05-09 11:36:53 -07:00
James Dong
ed742306b3 Add end of recording summary track info 
Change-Id: I2fcf589e70db225776ef7c8d0f28505ceb824c45
related-to-bug: 1854633
 2011-05-09 11:31:33 -07:00
James Dong
15dd5c168b Merge "Refactor MPEG4Writer::writeTrackHeader() method" 2011-05-09 11:27:51 -07:00
Ramesh Sudini
5d7b9271b3 Telephony: Signal Strength Changes. 
Change-Id: Ia406d21d860533e699a90d15130edcbc705ec645
 2011-05-09 10:57:42 -07:00
The Android Automerger
69d9ad653a am bdaa3abd: (-s ours) am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE 
* commit 'bdaa3abdf264372f337cfa9236e53b1e3cfde525':
  DO NOT MERGE Handle GET_POWER failures
  DO NOT MERGE: Don't send pause again when coming back from full screen
  DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
  DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
  DO NOT MERGE MTP: Implement GetThumb command
  DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
  DO NOT MERGE MTP: Add extended operations to support in-place editing of files
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
  DO NOT MERGE Fix media scanner uri handling.
  DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
  DO NOT MERGE MTP and media provider support for multiple storage devices:
  DO NOT MERGE MountService: Fix running media scanner at boot.
  DO NOT MERGE Fix deadlock in MountService
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
  DO NOT MERGE MountService: Add support for multiple volumes
 2011-05-09 10:53:40 -07:00
James Dong
7a6cea40b2 Refactor MPEG4Writer::writeTrackHeader() method 
o most of the mp4 file boxes has its own method now
TODO: remove some of the duplicated code for esds box, for instance.

Change-Id: Iae3dbb2410b79bc79aaee081b80569d339993c47
 2011-05-09 10:49:17 -07:00
The Android Automerger
bdaa3abdf2 am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE 
* commit '44e39d608cfddcbf56123480123822f26f20f259':
  DO NOT MERGE Handle GET_POWER failures
  DO NOT MERGE: Don't send pause again when coming back from full screen
  DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
  DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
  DO NOT MERGE MTP: Implement GetThumb command
  DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
  DO NOT MERGE MTP: Add extended operations to support in-place editing of files
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
  DO NOT MERGE Fix media scanner uri handling.
  DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
  DO NOT MERGE MTP and media provider support for multiple storage devices:
  DO NOT MERGE MountService: Fix running media scanner at boot.
  DO NOT MERGE Fix deadlock in MountService
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
  DO NOT MERGE MountService: Add support for multiple volumes
 2011-05-09 10:40:14 -07:00
satok
9aabb95781 Add one shot flag to the subtype 
Bug: 4257258

Change-Id: I21da9e11c882eea056beb84a2dfb0f28da8a98b1
 2011-05-09 19:40:12 +09:00
The Android Automerger
44e39d608c Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE 2011-05-08 22:38:02 -07:00
The Android Automerger
158e3582c0 Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2 2011-05-08 22:11:52 -07:00
Mathias Agopian
21696fb98a Merge "clear boot-animation background with black (not transparent) pixels" 2011-05-06 19:23:16 -07:00
Mathias Agopian
59f19e48c1 clear boot-animation background with black (not transparent) pixels 
Change-Id: I2fcf9f303e8324cefaa2d96f1c46647f70980bb2
 2011-05-06 19:22:12 -07:00
Scott Main
fd7dea5b2c am 5033d2b5: am 5de8226c: am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5 
* commit '5033d2b5287c48ac46a368ea85f080cfba0ccc8d':
  docs: update sdk tools sums and sizes based on candidate 5
 2011-05-06 17:27:39 -07:00
Scott Main
5033d2b528 am 5de8226c: am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5 
* commit '5de8226cc7caea7a52d9f2538f87d2cc34214ad0':
  docs: update sdk tools sums and sizes based on candidate 5
 2011-05-06 17:25:38 -07:00
Scott Main
5de8226cc7 am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5 
* commit '5cf78ecd2c523be442f52888ca613b9a92325a6c':
  docs: update sdk tools sums and sizes based on candidate 5
 2011-05-06 17:22:34 -07:00
Scott Main
5cf78ecd2c docs: update sdk tools sums and sizes 
based on candidate 5

Change-Id: I10929c0dfd889c919d70a4aaa4854ce1fecbc51d
 2011-05-06 17:17:17 -07:00
Scott Main
78ae80da99 am dcb6bd62: am 71a73dab: am b6451228: docs: update screens dashboard and add opengl dashboard 
* commit 'dcb6bd62cd4d7874d17a4f1b47b343dd88c4546a':
  docs: update screens dashboard and add opengl dashboard
 2011-05-06 17:10:58 -07:00
Scott Main
dcb6bd62cd am 71a73dab: am b6451228: docs: update screens dashboard and add opengl dashboard 
* commit '71a73dab704df2c536bbd4c16454cdcdc472fce2':
  docs: update screens dashboard and add opengl dashboard
 2011-05-06 17:08:06 -07:00
Scott Main
71a73dab70 am b6451228: docs: update screens dashboard and add opengl dashboard 
* commit 'b6451228526288b158c3b0bf0c5abbd5b072d51c':
  docs: update screens dashboard and add opengl dashboard
 2011-05-06 17:05:42 -07:00
Scott Main
b645122852 docs: update screens dashboard and add opengl dashboard 
Change-Id: Ic810bc9bb2a917ef1489f3d5f6c30b1bb75cb2e1
 2011-05-06 16:49:53 -07:00
Robert Greenwalt
1127372a04 am 56e8e0bc: am 2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE 
* commit '56e8e0bc8008d2bd60f04fc78ff036236a44f598':
  Fix 2 functions getting connections up by apnType
 2011-05-06 16:29:39 -07:00
Robert Greenwalt
56e8e0bc80 am 2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE 
* commit '2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe':
  Fix 2 functions getting connections up by apnType
 2011-05-06 16:25:39 -07:00
Robert Greenwalt
2b48ca07ef Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE 2011-05-06 16:21:06 -07:00
Robert Greenwalt
06ce569b76 Fix 2 functions getting connections up by apnType 
A bad impl that only effected non-default connections on CDMA.
bug:4392820

Change-Id: If178dba90c4525289098fc88b80cf918e35f4d32
 2011-05-06 16:01:46 -07:00
Marco Nelissen
48d4ee0101 Merge "Remove MediaStore.Audio.AudioColumns.ALBUM_ART" 2011-05-06 15:13:44 -07:00
Robert Greenwalt
103c5f9343 am 04f2ad1c: am 2499da83: Merge "Mark a disable apn so we don\'t reconnect." into honeycomb-LTE 
* commit '04f2ad1ce1378e115940ecc7ab49ed3b929795dc':
  Mark a disable apn so we don't reconnect.
 2011-05-06 15:07:52 -07:00
Irfan Sheriff
c351f52a4a DO NOT MERGE Handle GET_POWER failures 
Return a failure when GET_POWER returns a non-conforming
format

Bug: 4380317
Change-Id: Ie723c424ab07774f2be2594aa5deeaa5cd5ac280
 2011-05-06 15:06:30 -07:00
Robert Greenwalt
04f2ad1ce1 am 2499da83: Merge "Mark a disable apn so we don\'t reconnect." into honeycomb-LTE 
* commit '2499da83cb3db5f1d87a52e3e390139c98ff4210':
  Mark a disable apn so we don't reconnect.
 2011-05-06 14:57:08 -07:00
Marco Nelissen
1b312039a0 Remove MediaStore.Audio.AudioColumns.ALBUM_ART 
This column doesn't actually exist in the corresponding table, and
never has, so the presence of this definition is confusing.

Change-Id: I199f9a8effbdc9f45d51060830e3ad83675a0dff
 2011-05-06 14:55:48 -07:00