Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,903 Commits 3 Branches 0 Tags
409a57504fe6bb915d85f1091267206f7e0dfdcd
Commit Graph

38903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shimeng (Simon) Wang
bf9cf4d80d DO NOT MERGE 
Add wrapper method for native JNI call.

This is to check whether a given mimeType is supported in Android media
framework.

issue: 3101402
Change-Id: Ic8b412c045c36113c830296dacb42ed5f7371c9d
 2010-10-15 14:18:01 -07:00
Stephen Hines
6568896117 Add support for rsDebug with 64-bit types. 
Bug: 3099081
Change-Id: Ieb3af7757489876ef951be8527aa73f69e1481fd
 2010-10-15 14:17:55 -07:00
Ben Komalo
c1d71003fc Merge "Fix Spinners that don't have a hard pixel width set. getDimensionPixelSize -> getLayoutDimension" 2010-10-15 14:10:57 -07:00
Shimeng (Simon) Wang
31e4d66ada Merge "DO NOT MERGE" into gingerbread 2010-10-15 14:07:29 -07:00
Justin Ho
ff14aa16ba DO NOT MERGE - Updated media transport controls (hdpi and mdpi) 
Change-Id: I9b91c4bc13909017f433724e7c21de0db690eff6
 2010-10-15 14:03:57 -07:00
Hung-ying Tyan
0601be0803 am 4f5eb955: am bd57eeaf: SipService: add wake lock for multiple components. 
Merge commit '4f5eb9550ba2cc037c4aa81613574a38a956dd5c'

* commit '4f5eb9550ba2cc037c4aa81613574a38a956dd5c':
  SipService: add wake lock for multiple components.
 2010-10-15 14:01:39 -07:00
Hung-ying Tyan
61312df607 am f3a935f6: am 3bb10442: Merge "Make SipService listen to WIFI state change events." into gingerbread 
Merge commit 'f3a935f6aa421110c7b6f36f922223c195f751bc'

* commit 'f3a935f6aa421110c7b6f36f922223c195f751bc':
  Make SipService listen to WIFI state change events.
 2010-10-15 14:01:10 -07:00
Kenny Root
fcab0f5502 am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread 
Merge commit '8fda1636e3e35f060b9046294efd3c062a1fdb84'

* commit '8fda1636e3e35f060b9046294efd3c062a1fdb84':
  OBB: use PBKDF2 for key generation.
 2010-10-15 14:00:58 -07:00
Romain Guy
10aca41e51 Merge "Fix clipping issue in StackView." 2010-10-15 14:00:17 -07:00
Leon Scroggins
36cb18cf06 Merge "Line up textfield with WebTextView more often." into gingerbread 2010-10-15 13:58:38 -07:00
Romain Guy
e5ebcb0107 Fix clipping issue in StackView. 
Change-Id: I7ec28f25c3993a2bd7ef6399ba1923839d239905
 2010-10-15 13:57:28 -07:00
Irfan Sheriff
f8834f878f Merge "fetch macaddr right after supplicant connection" into gingerbread 2010-10-15 13:42:38 -07:00
David Brown
97d88927f2 am e3c50a54: am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread 
Merge commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a'

* commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a':
  Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
 2010-10-15 13:40:16 -07:00
Justin Ho
fb8058e946 am d9fdcfda: (-s ours) am c9110970: Merge "Updated media transport controls" into gingerbread 
Merge commit 'd9fdcfdaad2f8177f8fa2bed2d6bd978a28d7559'

* commit 'd9fdcfdaad2f8177f8fa2bed2d6bd978a28d7559':
  Updated media transport controls
 2010-10-15 13:39:31 -07:00
Gil Dobjanschi
f958f0fe9d Save the color for gradient effects 
Change-Id: I21e14344aa7410b5c99102ab41b4ec94db2fbe61
 2010-10-15 13:38:03 -07:00
Shimeng (Simon) Wang
9f547a8ca8 DO NOT MERGE 
Avoid sending false orientation event to webkit.

issue: 3101311
Change-Id: I819f046a119ad108256d6cece3f2e6ec1d643145
 2010-10-15 13:34:49 -07:00
Justin Ho
23f786a9da am 31e5901e: (-s ours) am b6634127: Merge "Updating popup center asset (v5)" into gingerbread 
Merge commit '31e5901e4c1b753787bfc3c2aef3463c38f2d0eb'

* commit '31e5901e4c1b753787bfc3c2aef3463c38f2d0eb':
  Updating popup center asset (v5)
 2010-10-15 13:32:21 -07:00
Andreas Huber
a4f391c9bf Include the framework copy of the OpenMAX headers instead of referencing external/opencore. 
Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6
related-to-bug: 3101573
 2010-10-15 13:31:29 -07:00
Andreas Huber
6ac35f0597 Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore. 
Change-Id: Ie2ecf9558d4ee80cb5a2bbe66ad49f2165a7b09c
related-to-bug: 3101573
 2010-10-15 13:30:27 -07:00
Ben Komalo
bdaa34c670 Fix Spinners that don't have a hard pixel width set. 
getDimensionPixelSize -> getLayoutDimension

Change-Id: Ic126955ad7c7cee3aea423c43fc16da02ec9664e
 2010-10-15 13:27:11 -07:00
Kenny Root
f25d24b2c7 resolved conflicts for merge of 8b1082bb to master 
Change-Id: If9d898123894c53bf83ac28cc7c03cd849c8ef17
 2010-10-15 13:10:01 -07:00
Jaikumar Ganesh
db3694d030 am a905d955: am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread 
Merge commit 'a905d9551103c5be465429ffeb0352b78058457e'

* commit 'a905d9551103c5be465429ffeb0352b78058457e':
  Remove STOPSHIP and reduce log spam.
 2010-10-15 12:44:39 -07:00
Scott Main
2c1dab4483 am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo 
Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread

* commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c':
  docs: fix typo; surface dev guide link in package description
 2010-10-15 12:35:04 -07:00
Scott Main
7f3addf37f am 09da9609: docs: fix code snippet errors 
Merge commit '09da96099917141f2b90d53f61baa822bdd434d7' into gingerbread

* commit '09da96099917141f2b90d53f61baa822bdd434d7':
  docs: fix code snippet errors
 2010-10-15 12:34:50 -07:00
Eric Laurent
0e7a4d9edc Fix issue 3098880. 
Test value returned by getJNIEnv() in android_media_AudioSystem_error_callback()
and exit if NULL.

Change-Id: If30e5a05c585f34c66e6ad8cece3f7b46ef4be8e
 2010-10-15 12:33:16 -07:00
Ben Komalo
4138b33826 Merge "Apply values set in "dropDownWidth" attribute of Spinner styles." 2010-10-15 11:55:52 -07:00
Justin Ho
d364366824 Merge "DO NOT MERGE - Updated ADB icon" into gingerbread 2010-10-15 11:53:49 -07:00
Leon Scroggins
2a30744cd7 Line up textfield with WebTextView more often. 
Bug:3097705

Line up when the selection changes (such as when the
selection is altered by the context menu) or when the
WebTextView scrolls.

Change-Id: Ia491064548131be1ac6f4d701a43cd8419a25367
 2010-10-15 14:49:18 -04:00
Ben Komalo
72536f7240 Apply values set in "dropDownWidth" attribute of Spinner styles. 
Bug: 3099224
Change-Id: I904f2ef39a65a62076ff82319128a31767a2394b
 2010-10-15 11:42:07 -07:00
Kenny Root
f41441178b Merge "resolved conflicts for merge of c6bf3eaa to master" 2010-10-15 11:33:47 -07:00
Justin Ho
7e9f686413 DO NOT MERGE - Updated ADB icon 
Change-Id: I358ce60203746ccf38d92f71d1c684670737c97b
 2010-10-15 11:31:35 -07:00
Jason Sams
afbcc82ae8 Merge "Fix deadlock on RS teardown." 2010-10-15 11:28:56 -07:00
Dianne Hackborn
efb581018b Debug logs for issue #3101415: Apps seem to have their UID changed over time. 
- Activity manager now prints the pid doing a startActivity request.
- Package manager now remembers messages about problems it has parsing
  packages.xml.

Change-Id: I11a75aa3953dbfa5dd41cfbdf69116c764ec228f
 2010-10-15 11:22:17 -07:00
Jason Sams
0d2b2d5e13 Fix deadlock on RS teardown. 
Change-Id: I34d2702b535e28e9519c7368fd8a942bfe0724bc
 2010-10-15 11:21:24 -07:00
Kenny Root
9ca6d71c52 resolved conflicts for merge of c6bf3eaa to master 
Change-Id: I6421faf52c160a81b03c63b91f1aedfe0f151cac
 2010-10-15 11:20:42 -07:00
Nick Pelly
a851d8d0cf Merge "NFC: Move NFC service implementation out of system_server." into gingerbread 2010-10-15 10:55:11 -07:00
Scott Main
fda5b19c75 Merge "docs: fix typo; surface dev guide link in package description" into froyo 2010-10-15 10:46:33 -07:00
Scott Main
09da960999 docs: fix code snippet errors 
Change-Id: Ie0ef6d4e642b6f9a68bdadd3e507f9fe2dd323d9
 2010-10-15 10:40:54 -07:00
Irfan Sheriff
79f7fe2daa fetch macaddr right after supplicant connection 
Bug: 3072163
Change-Id: I13466e3bc73a1a95d42faf17650fad4383f7e5b2
 2010-10-15 10:30:14 -07:00
Scott Main
36cdecd89d docs: fix typo; surface dev guide link in package description 
Change-Id: I2dc09bb6b79cbe3f80819d6193eb0d8a3565310d
 2010-10-15 10:19:27 -07:00
Nick Kralevich
6bc34da8ac am 612ebb92: Revert "Update the documentation for content provider security." 
Merge commit '612ebb9257e2adf982ed846fa43251c3754361f7' into gingerbread-plus-aosp

* commit '612ebb9257e2adf982ed846fa43251c3754361f7':
  Revert "Update the documentation for content provider security."
 2010-10-15 10:11:50 -07:00
Nick Kralevich
612ebb9257 Revert "Update the documentation for content provider security." 
This reverts commit 4fe4d4c91c.
 2010-10-15 10:05:29 -07:00
Jaikumar Ganesh
72cd64b20e resolved conflicts for merge of bbb90d13 to master 
Change-Id: I85de73f6e11e7547a006d41ca49021bca19af14b
 2010-10-15 10:02:57 -07:00
Mindy Pereira
97929aa996 am baf56089: (-s ours) am 998c6777: Merge "Never show overscroll if the page scrolls at all." into gingerbread 
Merge commit 'baf5608941ae4de2bb5620fc81291f33da9d57ac'

* commit 'baf5608941ae4de2bb5620fc81291f33da9d57ac':
  Never show overscroll if the page scrolls at all.
 2010-10-15 09:29:40 -07:00
Nick Kralevich
86052a8740 am 66f1c459: Merge "Update the documentation for content provider security." into gingerbread 
Merge commit '66f1c459ac15d1dba1850cb30759500d35078f29' into gingerbread-plus-aosp

* commit '66f1c459ac15d1dba1850cb30759500d35078f29':
  Update the documentation for content provider security.
 2010-10-15 09:24:39 -07:00
Nick Kralevich
66f1c459ac Merge "Update the documentation for content provider security." into gingerbread 2010-10-15 09:17:12 -07:00
Mindy Pereira
7daa25d8b0 am 7d73b706: (-s ours) am 868322ce: Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread 
Merge commit '7d73b7066867368ebb30dd67a1649ae9db04b93e'

* commit '7d73b7066867368ebb30dd67a1649ae9db04b93e':
  Reduce the time it takes to decay the glow after a pull.
 2010-10-15 09:10:52 -07:00
Steve Block
1be7339077 Rename DeviceOrientationManager to DeviceMotionAndOrientationManager 
Requires a corresponding change in external/webkit ...
https://android-git.corp.google.com/g/74336

Change-Id: Ic8042a77db200cd2b0ea5ae3f70074aaba0cb414
 2010-10-15 17:08:20 +01:00
Andreas Huber
cb90947bf8 am e1f3976b: Merge "Make sure we cache the sampleTable again if using the caching datasource." into gingerbread 
Merge commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c' into gingerbread-plus-aosp

* commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c':
  Make sure we cache the sampleTable again if using the caching datasource.
 2010-10-15 08:54:17 -07:00
Brad Fitzpatrick
33476b2db8 am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread 
Merge commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6' into gingerbread-plus-aosp

* commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6':
  Don't crash on null Vibrator during reboot.
 2010-10-15 08:51:01 -07:00