ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
19,197 Commits 2 Branches 0 Tags 54 MiB
851bdd74d1
Commit Graph

19197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Malin
851bdd74d1 am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread 
Merge commit '75d3591b2dd60e50182542045147b9b6033c2b85' into gingerbread-plus-aosp

* commit '75d3591b2dd60e50182542045147b9b6033c2b85':
  DOC CHANGE: Fix bug in Testing doc
 2010-10-14 12:09:33 -07:00
Joe Malin
43233b1a43 Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread 2010-10-14 12:05:33 -07:00
Jeff Brown
b2c3e78597 am 2d441e14: Merge "Make sure EventHub reports added/removed devices immediately." into gingerbread 
Merge commit '2d441e148502bb492816ef84837510397f77a039' into gingerbread-plus-aosp

* commit '2d441e148502bb492816ef84837510397f77a039':
  Make sure EventHub reports added/removed devices immediately.
 2010-10-14 12:03:36 -07:00
Roy West
7f82f9bb3c am 29f28cdc: Merge "Change storage names to match 10-13 decision" into gingerbread 
Merge commit '29f28cdc5315d11919595bf8623d6a67797a34e7' into gingerbread-plus-aosp

* commit '29f28cdc5315d11919595bf8623d6a67797a34e7':
  Change storage names to match 10-13 decision
 2010-10-14 12:03:19 -07:00
Joe Onorato
eb42bb3b23 am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread 
Merge commit '3d828e62c856074334a00ce7c621050b4d7166e4' into gingerbread-plus-aosp

* commit '3d828e62c856074334a00ce7c621050b4d7166e4':
  Do not build pbkdf2gen on non-Linux hosts
 2010-10-14 12:03:07 -07:00
Gilles Debunne
d029b4fcec am 53ea7f58: Merge "Really leave text selection mode when using the trackball." into gingerbread 
Merge commit '53ea7f58c071563b7c5dd0061df39d3b4bf38a63' into gingerbread-plus-aosp

* commit '53ea7f58c071563b7c5dd0061df39d3b4bf38a63':
  Really leave text selection mode when using the trackball.
 2010-10-14 12:02:44 -07:00
Jeff Brown
c04563d340 Merge "Make sure EventHub reports added/removed devices immediately." into gingerbread 2010-10-14 11:52:58 -07:00
Roy West
7b379f690b Merge "Change storage names to match 10-13 decision" into gingerbread 2010-10-14 11:15:50 -07:00
Joe Onorato
1013d9e5df Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread 2010-10-14 10:59:37 -07:00
Gilles Debunne
8aa3f28b6f Merge "Really leave text selection mode when using the trackball." into gingerbread 2010-10-14 10:58:59 -07:00
Jeff Brown
7e40f36237 Make sure EventHub reports added/removed devices immediately. 
Fixed a bug where EventHub would not report changes in devices
until the next event.

Bug: 3096147
Change-Id: Ie4c3e1d14d0ad806cfaa212611ce06034d1b94d4
 2010-10-14 02:23:43 -07:00
Hung-ying Tyan
f5f4f67704 am bd57eeaf: SipService: add wake lock for multiple components. 
Merge commit 'bd57eeafe034cf850225db403700b5dc5db5ebcc' into gingerbread-plus-aosp

* commit 'bd57eeafe034cf850225db403700b5dc5db5ebcc':
  SipService: add wake lock for multiple components.
 2010-10-14 02:15:23 -07:00
Hung-ying Tyan
a878962ff9 am 3bb10442: Merge "Make SipService listen to WIFI state change events." into gingerbread 
Merge commit '3bb1044243ad38da35ccddc3e0d6d92d64fefe3e' into gingerbread-plus-aosp

* commit '3bb1044243ad38da35ccddc3e0d6d92d64fefe3e':
  Make SipService listen to WIFI state change events.
 2010-10-13 22:54:20 -07:00
Kenny Root
d47001fc34 am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread 
Merge commit 'bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp

* commit 'bdf8034c657147226b2390eef113ff841e0d6065':
  OBB: use PBKDF2 for key generation.
 2010-10-13 22:54:10 -07:00
Hung-ying Tyan
9f2c66df5d Merge "Make SipService listen to WIFI state change events." into gingerbread 2010-10-13 18:36:31 -07:00
Kenny Root
7f7c9a24b6 Merge "OBB: use PBKDF2 for key generation." into gingerbread 2010-10-13 18:29:43 -07:00
Kenny Root
95a6889312 OBB: use PBKDF2 for key generation. 
Switch to using PBKDF2 for the key generation for OBBs. Any previously
generated OBBs will stop being read correctly. A small pbkdf2gen program
is available to allow generation of appropriate keys with the salts.

Bug: 3059950
Change-Id: If4305c989fd692fd1150eb270dbf751e09c37295
 2010-10-13 18:25:33 -07:00
David Brown
ac4d53405f am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread 
Merge commit 'cebe5b2e01f8ebbf9089aebc386caecea232df76' into gingerbread-plus-aosp

* commit 'cebe5b2e01f8ebbf9089aebc386caecea232df76':
  Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
 2010-10-13 17:50:43 -07:00
David Brown
5ebbba59e7 Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread 2010-10-13 17:48:05 -07:00
Justin Ho
353b80f4d6 am c9110970: Merge "Updated media transport controls" into gingerbread 
Merge commit 'c911097095d0dd909abf4f77628f2154be6dbf9a' into gingerbread-plus-aosp

* commit 'c911097095d0dd909abf4f77628f2154be6dbf9a':
  Updated media transport controls
 2010-10-13 17:47:19 -07:00
Justin Ho
a81d5212c2 Merge "Updated media transport controls" into gingerbread 2010-10-13 17:42:03 -07:00
Justin Ho
45fd903c5a am b6634127: Merge "Updating popup center asset (v5)" into gingerbread 
Merge commit 'b663412741ca3fa30473106a7bda3a8a95a5e194' into gingerbread-plus-aosp

* commit 'b663412741ca3fa30473106a7bda3a8a95a5e194':
  Updating popup center asset (v5)
 2010-10-13 17:33:36 -07:00
Justin Ho
6ea889064d Merge "Updating popup center asset (v5)" into gingerbread 2010-10-13 17:15:00 -07:00
Jesse Wilson
567307a5d4 am 3394db7d: Merge "Regenerate preloaded classes for Gingerbread." into gingerbread 
Merge commit '3394db7d9432053e56d86b3f24e64deeb3099950' into gingerbread-plus-aosp

* commit '3394db7d9432053e56d86b3f24e64deeb3099950':
  Regenerate preloaded classes for Gingerbread.
 2010-10-13 17:02:48 -07:00
Jesse Wilson
04e736394a Merge "Regenerate preloaded classes for Gingerbread." into gingerbread 2010-10-13 16:59:12 -07:00
Jaikumar Ganesh
a28308b33a am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread 
Merge commit 'a31cbd61bc53730d756464b0c273475c4f738066' into gingerbread-plus-aosp

* commit 'a31cbd61bc53730d756464b0c273475c4f738066':
  Remove STOPSHIP and reduce log spam.
 2010-10-13 16:56:27 -07:00
Vasu Nori
a533ebe220 am 51679ca8: Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerbread 
Merge commit '51679ca89293ef33275b9681018c09be3948bf1c' into gingerbread-plus-aosp

* commit '51679ca89293ef33275b9681018c09be3948bf1c':
  bug:3069735 in Download UI app, handle deletes correctly
 2010-10-13 16:52:57 -07:00
Jaikumar Ganesh
0f67f57fa9 Merge "Remove STOPSHIP and reduce log spam." into gingerbread 2010-10-13 16:52:52 -07:00
Vasu Nori
3de1115fc9 Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerbread 2010-10-13 16:50:45 -07:00
Jaikumar Ganesh
0c373811ab am c008ca96: Merge "Work around for errant headsets." into gingerbread 
Merge commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18' into gingerbread-plus-aosp

* commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18':
  Work around for errant headsets.
 2010-10-13 16:48:41 -07:00
Jaikumar Ganesh
93aa52d2b4 Merge "Work around for errant headsets." into gingerbread 2010-10-13 16:44:17 -07:00
Mindy Pereira
bf60e0e7bd am 998c6777: Merge "Never show overscroll if the page scrolls at all." into gingerbread 
Merge commit '998c67774aa2260ed05a39df45d983feb72e683c' into gingerbread-plus-aosp

* commit '998c67774aa2260ed05a39df45d983feb72e683c':
  Never show overscroll if the page scrolls at all.
 2010-10-13 16:34:27 -07:00
Mindy Pereira
1837c61e40 Merge "Never show overscroll if the page scrolls at all." into gingerbread 2010-10-13 16:31:18 -07:00
Mindy Pereira
14fe6b832a am 868322ce: Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread 
Merge commit '868322ced806ec58750edd8ce964f4e17507ddad' into gingerbread-plus-aosp

* commit '868322ced806ec58750edd8ce964f4e17507ddad':
  Reduce the time it takes to decay the glow after a pull.
 2010-10-13 16:25:59 -07:00
Mindy Pereira
742983fdec Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread 2010-10-13 16:23:15 -07:00
Mathias Agopian
d91595b000 am 011b5bcc: Merge "implement part of [3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread 
Merge commit '011b5bcc0355338b7ff906656282a54ffaa04b5a' into gingerbread-plus-aosp

* commit '011b5bcc0355338b7ff906656282a54ffaa04b5a':
  implement part of [3094280] New animation for screen on and screen off
 2010-10-13 15:59:42 -07:00
Mathias Agopian
c2a2b5c440 Merge "implement part of [3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread 2010-10-13 15:55:57 -07:00
Andreas Huber
48ffcfce90 am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread 
Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp

* commit '90d59d180bd963f00161e6bfaabfda432960cab6':
  Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
 2010-10-13 15:50:27 -07:00
Andreas Huber
bd44d85426 Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread 2010-10-13 15:46:18 -07:00
Jean-Baptiste Queru
779d49ea2e Merge "ignore - a similar change already exists" into gingerbread-plus-aosp 2010-10-13 15:26:15 -07:00
Jean-Baptiste Queru
42dda50965 ignore - a similar change already exists 
Change-Id: I5e8be06213161c7f3ab284a74030b6117bb43dab
 2010-10-13 15:23:38 -07:00
Dan Morrill
31d44c288e am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread 
Merge commit '5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1' into gingerbread-plus-aosp

* commit '5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1':
  Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
 2010-10-13 15:23:27 -07:00
Dan Morrill
03a7820c96 Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread 2010-10-13 15:20:34 -07:00
Kenny Root
a5661d2ee6 am 361a6ad1: Merge "Handle native library deletion in scanPackage" into gingerbread 
Merge commit '361a6ad16dedfed871c76e8fa64eb45aa82a0088' into gingerbread-plus-aosp

* commit '361a6ad16dedfed871c76e8fa64eb45aa82a0088':
  Handle native library deletion in scanPackage
 2010-10-13 14:53:23 -07:00
Kenny Root
fab4a31891 am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread 
Merge commit '49ec3dff4350209e109fc11dafe4294acea36146' into gingerbread-plus-aosp

* commit '49ec3dff4350209e109fc11dafe4294acea36146':
  OBB: Change documentation to reflect reality
 2010-10-13 14:53:18 -07:00
Kenny Root
8e896920e7 Merge "Handle native library deletion in scanPackage" into gingerbread 2010-10-13 14:50:29 -07:00
Kenny Root
322ea9435a Merge "OBB: Change documentation to reflect reality" into gingerbread 2010-10-13 14:49:42 -07:00
Andreas Huber
4de1235c82 am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread 
Merge commit '5f42391701c0657d520d00f62a4c061b18ba1280' into gingerbread-plus-aosp

* commit '5f42391701c0657d520d00f62a4c061b18ba1280':
  Attempt to derive the avg. bitrate of the entire stream from metadata.
 2010-10-13 14:28:52 -07:00
Mathias Agopian
9daa5c9b9d implement part of [3094280] New animation for screen on and screen off 
add support for screen on animation

Change-Id: If50cf52ae04b95b42da7d74cf7fa96d5cb54d238
 2010-10-13 14:28:26 -07:00
Andreas Huber
f61daab2ed Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread 2010-10-13 14:25:32 -07:00