ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,779 Commits 2 Branches 0 Tags 54 MiB
1b01a525c8
Commit Graph

19779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
1b01a525c8 am 32b07fc6: am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo 
Merge commit '32b07fc6cab290466c010d05667940a9ba5672e2'

* commit '32b07fc6cab290466c010d05667940a9ba5672e2':
  docs: add dev guide for getting user location
 2010-08-24 11:21:04 -07:00
Andreas Huber
e90657a362 am 31e71131: am 3e22ef1e: Merge "Better handling of rtsp connection and disconnection." into gingerbread 
Merge commit '31e71131049c943a388134e796087e109248efcc'

* commit '31e71131049c943a388134e796087e109248efcc':
  Better handling of rtsp connection and disconnection.
 2010-08-24 11:20:57 -07:00
James Dong
db94c17daf am 28a92120: am 3f51fa78: Runtime dump support for MediaWriter 
Merge commit '28a92120a702289533a9c9d004bd60f83b2fd98b'

* commit '28a92120a702289533a9c9d004bd60f83b2fd98b':
  Runtime dump support for MediaWriter
 2010-08-24 11:20:40 -07:00
Chia-chi Yeh
dc322eaf61 am a102871c: am b80e610b: Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread 
Merge commit 'a102871c7cbb74ebddc53231a871145de61351b0'

* commit 'a102871c7cbb74ebddc53231a871145de61351b0':
  Visualizer: replace the FFT implementation with a faster one.
 2010-08-24 11:19:28 -07:00
Kenny Root
2e176af8f2 resolved conflicts for merge of d51a933b to master 
Change-Id: Ibc02613d129b0bdbb579c1a4e58147d720301acc
 2010-08-24 11:16:28 -07:00
Irfan Sheriff
8ccb3cade1 am b65444df: (-s ours) am 80db4381: Merge "DO NOT MERGE Enable all networks on screen on" into gingerbread 
Merge commit 'b65444df013020000a0d60491e9cf14c950c9500'

* commit 'b65444df013020000a0d60491e9cf14c950c9500':
  DO NOT MERGE Enable all networks on screen on
 2010-08-24 11:02:08 -07:00
Steve Howard
2a8e18c730 am 6d895fdb: am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerbread 
Merge commit '6d895fdbc023743f3870042e73a5614764e4165b'

* commit '6d895fdbc023743f3870042e73a5614764e4165b':
  Make ProgressBar.setVisibility() remotable.
 2010-08-24 11:01:14 -07:00
Trevor Johns
20414f83b6 am 63f05fe4: am bb75aa90: am ca9d51b1: Disabling AccessibilityService sample from build system. 
Merge commit '63f05fe487d23e559e9d3f2c285d1c35aa75b9b3'

* commit '63f05fe487d23e559e9d3f2c285d1c35aa75b9b3':
  Disabling AccessibilityService sample from build system.
 2010-08-24 11:01:02 -07:00
Gilles Debunne
ab5d2814ac Merge "Added new Holo assets for Check boxes and Radio buttons." 2010-08-24 10:57:20 -07:00
Jean-Baptiste Queru
ad0f5cc955 resolved conflicts for merge of c64b916e to master 
Change-Id: I31b84d72186a918f19e0c9dee8fdebc83f661cc1
 2010-08-24 10:45:16 -07:00
Jean-Baptiste Queru
85df24f114 am f235a519: am ec58dff0: Fix build - remove dead doc link 
Merge commit 'f235a519398d47db1bbb8eb5e773565314b1fa4f'

* commit 'f235a519398d47db1bbb8eb5e773565314b1fa4f':
  Fix build - remove dead doc link
 2010-08-24 10:25:00 -07:00
Jean-Baptiste Queru
851a5c882e am 0460e26a: resolved conflicts for merge of 691be97f to gingerbread-plus-aosp 
Merge commit '0460e26a4c9915f77c915d2cc3540969802b02fa'

* commit '0460e26a4c9915f77c915d2cc3540969802b02fa':
  add new sensor types for handling gyro data and device orientation
 2010-08-24 10:17:03 -07:00
Wink Saville
5ff0512a0e am d9034879: am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN. 
Merge commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2'

* commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2':
  Change CDMAPhone.getDeviceId to return MEID or ESN.
 2010-08-24 10:16:42 -07:00
Jean-Baptiste Queru
b11bdfbf13 am b13c9bc5: manual merge 
Merge commit 'b13c9bc5219ca85c36507fb3a8d5923e3de974b6'

* commit 'b13c9bc5219ca85c36507fb3a8d5923e3de974b6':
  BluetoothHeadset.java:
 2010-08-24 10:16:28 -07:00
Romain Guy
e83f259acf am 5a14271a: am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread 
Merge commit '5a14271aacb932ba0d52978c939f74e4c685f7d6'

* commit '5a14271aacb932ba0d52978c939f74e4c685f7d6':
  Load bitmaps in the correct format.
 2010-08-24 10:15:51 -07:00
Vasu Nori
87e80d759e Merge "SQLiteOpenHelper should discard closed singleton database objects" 2010-08-24 10:08:13 -07:00
Kenny Root
375d098185 resolved conflicts for merge of 485de781 to master 
Change-Id: I483cb81596f09b024b1aea7fc55960183f38b24f
 2010-08-24 09:57:33 -07:00
Nipun Kwatra
e5cc9039a5 am 701b710c: am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread 
Merge commit '701b710c194181765616520f6d89d450b4b6c1f5'

* commit '701b710c194181765616520f6d89d450b4b6c1f5':
  setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
 2010-08-24 09:03:55 -07:00
Dianne Hackborn
b6c2f184bf am a3ece8bd: am 32519259: Merge "Fix a few small battery stats problems:" into gingerbread 
Merge commit 'a3ece8bde37acd81b08c4e3c1cb0e6d006ade3e0'

* commit 'a3ece8bde37acd81b08c4e3c1cb0e6d006ade3e0':
  Fix a few small battery stats problems:
 2010-08-24 09:03:45 -07:00
Brian Carlstrom
297e0a2e26 am 005f0d08: am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread 
Merge commit '005f0d084ec3a5c7a2850b807c6054a1fc904daa'

* commit '005f0d084ec3a5c7a2850b807c6054a1fc904daa':
  Tracking merge of dalvik-dev to gingerbread
 2010-08-24 09:03:29 -07:00
Dianne Hackborn
c5d0c0932e am 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gingerbread 
Merge commit '8b569c8d49924d849793513a5418ef0350320962'

* commit '8b569c8d49924d849793513a5418ef0350320962':
  Fix aapt dump badging to support xlarge screens.
 2010-08-24 09:02:43 -07:00
Kenny Root
8d7fcccef6 am b90b9d54: am 6be23712: Merge "Free created FileMap when uncompressing files" into gingerbread 
Merge commit 'b90b9d54eb6bbc3a4045ff0bf46d3366822e835e'

* commit 'b90b9d54eb6bbc3a4045ff0bf46d3366822e835e':
  Free created FileMap when uncompressing files
 2010-08-24 09:02:28 -07:00
Dianne Hackborn
b593e13304 am c5794ae7: (-s ours) am baf72cd7: Merge "DO NOT MERGE 2928156 Accessibility event\'s parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread 
Merge commit 'c5794ae72547cce6cbae1e58df5d32bc0e2520fd'

* commit 'c5794ae72547cce6cbae1e58df5d32bc0e2520fd':
  DO NOT MERGE 2928156  Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)
 2010-08-24 09:02:16 -07:00
Robert Greenwalt
5bd49cba5e am 2b05a95b: (-s ours) am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread 
Merge commit '2b05a95bccafddac15debdfb5c39107aa3418783'

* commit '2b05a95bccafddac15debdfb5c39107aa3418783':
  DO NOT MERGE Fixing Connectivity
 2010-08-24 09:02:05 -07:00
Dianne Hackborn
4d0179e99f am 5474b0f8: am 39792d22: Fix bugs with granting permissions through onNewIntent(). 
Merge commit '5474b0f8603ee66413c3e44600ca46f162f3089e'

* commit '5474b0f8603ee66413c3e44600ca46f162f3089e':
  Fix bugs with granting permissions through onNewIntent().
 2010-08-24 09:01:54 -07:00
James Dong
b6980104f1 am 3fc01525: am b755e325: Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread 
Merge commit '3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5'

* commit '3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5':
  Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
 2010-08-24 09:01:39 -07:00
Wu-cheng Li
28b03d7c87 am 346b6126: am 97a56269: Merge "Add camera fps range API." into gingerbread 
Merge commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e'

* commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e':
  Add camera fps range API.
 2010-08-24 09:01:27 -07:00
Cary Clark
427fa8b364 am d93ecb3f: (-s ours) am 581f7861: DO NOT MERGE Refactor find and select dialogs 
Merge commit 'd93ecb3fab669bb563fcb903966e854a593ceace'

* commit 'd93ecb3fab669bb563fcb903966e854a593ceace':
  DO NOT MERGE Refactor find and select dialogs
 2010-08-24 09:00:53 -07:00
android-build SharedAccount
41c275be24 Merge commit '7e8f0c7454339d240761684807135fbc490e99f6' 2010-08-24 08:50:35 -07:00
android-build SharedAccount
948248a431 Merge commit '6cf5eb0606ecdc22e7c431971a0c621413564840' 2010-08-24 08:48:56 -07:00
Steve Block
0098b80abf Merge "Hook up device sensors for DeviceOrientation" 2010-08-24 08:35:03 -07:00
Irfan Sheriff
84eb5324c2 Merge "cache configured networks" 2010-08-24 08:30:49 -07:00
Mike Lockwood
9ac6d66724 Merge "MTP: Check and clear exceptions after calling into Java in MtpDatabase" 2010-08-24 08:28:54 -07:00
Steve Block
7f369d4d68 Merge "Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html" 2010-08-24 07:51:07 -07:00
Kristian Monsen
ffd22e63bf Merge "Java calls to get Android specific files." 2010-08-24 04:50:12 -07:00
Chih-Chung Chang
ef622e7d72 am 3a59ddc6: (-s ours) am dc2eabd1: Merge "Don\'t recycle native bitmap after the finalizer is called." into gingerbread 
Merge commit '3a59ddc67c6ad33c01d36338603586f90d94e71b'

* commit '3a59ddc67c6ad33c01d36338603586f90d94e71b':
  Don't recycle native bitmap after the finalizer is called.
 2010-08-23 19:56:34 -07:00
Dianne Hackborn
878e05d978 Merge "Make Theme.Holo the default theme for new apps." 2010-08-23 18:53:06 -07:00
Jaikumar Ganesh
6400334b67 Merge "Add BNEP_SVC UUID for incoming tethering connections." 2010-08-23 18:33:18 -07:00
Adam Powell
81b8a10c49 Merge "Fix some issues with touch event splitting around event timing" 2010-08-23 18:20:56 -07:00
Jamie Gennis
a5382fc9bd Merge "Add the setPreviewWindow camera HAL API to the camera stub." 2010-08-23 17:26:57 -07:00
Jaikumar Ganesh
3ead65f7a7 Merge "Revert "Allow reliable detection of a message that is in use."" 2010-08-23 17:12:17 -07:00
Irfan Sheriff
51fa908529 Merge "Clean up synchronous calls" 2010-08-23 16:11:42 -07:00
Jamie Gennis
8ac75d31b4 Merge "Change the framework to use the new camera preview path." 2010-08-23 15:16:20 -07:00
Wink Saville
87d35257b4 Merge "Allow reliable detection of a message that is in use." 2010-08-23 15:00:23 -07:00
Jamie Gennis
89c2dd2cc2 Change the framework to use the new camera preview path. 
This change makes the camera HAL interface take an ANativeWindow interface from
which all the camera preview buffers will be allocated.  The framework code
running in application processes now passes a Surface object rather than an
ISurface to the camera server via Binder when setting the preview surface.  The
camera server then forwards that Surface object (which implements the
ANativeWindow interface) to the camera HAL, which uses it to communicate with
SurfaceFlinger to allocate the camera preview buffers.

Change-Id: Ie438f721559cd7de5e4f848a26d96360dda07b5f
 2010-08-23 14:31:30 -07:00
Andreas Huber
17298287b7 Merge "Account for the _ADRENO constant being moved." 2010-08-23 14:08:02 -07:00
Chet Haase
22f7f352f8 Merge "Adding animation facilities to simplify layout transitions" 2010-08-23 13:54:07 -07:00
Jaikumar Ganesh
1c3dda0dc1 Merge "Add Tethering class bit check." 2010-08-23 13:22:38 -07:00
Dima Zavin
13598acde5 Merge changes Ic94c18a6,Iff770de1,Ifed6b4dc 
* changes:
  libstagefright: enable tegra hw audio decoders
  libstagefright: Enable tegra hw video decoders
  libstagefright: Enable tegra hw encoder
 2010-08-23 13:18:58 -07:00
Scott Main
3faddf6d78 am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo 
Merge commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9' into gingerbread-plus-aosp

* commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9':
  docs: add dev guide for getting user location
 2010-08-23 12:44:18 -07:00