ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,322 Commits 2 Branches 0 Tags 54 MiB
7cabd289a1
Commit Graph

18322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Wilson
7cabd289a1 am 8217eac0: Merge "Fix double-checked locking bug in LocalSocket." into gingerbread 
Merge commit '8217eac0a0b6d394139eefa85d5f467240427e98' into gingerbread-plus-aosp

* commit '8217eac0a0b6d394139eefa85d5f467240427e98':
  Fix double-checked locking bug in LocalSocket.
 2010-09-21 10:33:53 -07:00
Jesse Wilson
3848410fdd Merge "Fix double-checked locking bug in LocalSocket." into gingerbread 2010-09-21 10:30:39 -07:00
James Dong
49bc696788 am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread 
Merge commit 'e5206694174d2140e662832425665ec3890fcc73' into gingerbread-plus-aosp

* commit 'e5206694174d2140e662832425665ec3890fcc73':
  Another attempt for fixing AAC+/eAAC+ related issue
 2010-09-21 10:24:10 -07:00
Jean-Baptiste Queru
808a411945 am 7869f08c: Merge "MOTOYA Japanese fonts" 
Merge commit '7869f08c55d774b0006c2260e87747ff5e0746f2' into gingerbread-plus-aosp

* commit '7869f08c55d774b0006c2260e87747ff5e0746f2':
  MOTOYA Japanese fonts
 2010-09-21 10:21:37 -07:00
James Dong
f65d7c0669 Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread 2010-09-21 10:19:22 -07:00
Jean-Baptiste Queru
b11c8ae887 Merge "MOTOYA Japanese fonts" 2010-09-21 10:09:12 -07:00
Wu-cheng Li
6492c6ff6d am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO. 
Merge commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2' into gingerbread-plus-aosp

* commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2':
  Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
 2010-09-21 08:57:15 -07:00
Mike Lockwood
91fd8f7085 am 92630c78: Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread 
Merge commit '92630c787d0ae34c7ae3cb29c2d261f1acaf18b9' into gingerbread-plus-aosp

* commit '92630c787d0ae34c7ae3cb29c2d261f1acaf18b9':
  SystemUI: Use new USB notifications to detect USB disconnect.
 2010-09-21 08:48:15 -07:00
Mike Lockwood
a59fba9eac Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread 2010-09-21 08:45:34 -07:00
Robert Greenwalt
d2818bad1c am 6548f395: Merge "Inet status bug fix" into gingerbread 
Merge commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef' into gingerbread-plus-aosp

* commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef':
  Inet status bug fix
 2010-09-21 08:22:59 -07:00
Robert Greenwalt
2d1b598549 Merge "Inet status bug fix" into gingerbread 2010-09-21 08:06:15 -07:00
Dianne Hackborn
a925619bae am 6f33b65f: Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread 
Merge commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9' into gingerbread-plus-aosp

* commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9':
  Fix issue #2999757: "Application Redirected" dialogue showing up erratically
 2010-09-21 00:27:06 -07:00
Dianne Hackborn
cf93d7e873 Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread 2010-09-21 00:24:23 -07:00
Chung-yih Wang
fd0e2a86c1 am 4c571a62: Fix the build. 
Merge commit '4c571a62b1a4fb71585179bce84246b55097b47e' into gingerbread-plus-aosp

* commit '4c571a62b1a4fb71585179bce84246b55097b47e':
  Fix the build.
 2010-09-20 22:48:09 -07:00
Dianne Hackborn
a13253d0b4 am 51aaab3d: Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread 
Merge commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d' into gingerbread-plus-aosp

* commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d':
  Fix #2999258: ANR in Settings after every reboot
 2010-09-20 22:22:54 -07:00
Dianne Hackborn
e228f82f6a Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread 2010-09-20 22:19:47 -07:00
Chung-yih Wang
55d51aed82 am 708e4251: Merge "Revert the ANSWERING state." into gingerbread 
Merge commit '708e42512a8b14202cd872d96d1f071ccb4cf915' into gingerbread-plus-aosp

* commit '708e42512a8b14202cd872d96d1f071ccb4cf915':
  Revert the ANSWERING state.
 2010-09-20 22:06:49 -07:00
Chung-yih Wang
4e89ce3f98 Merge "Revert the ANSWERING state." into gingerbread 2010-09-20 22:04:57 -07:00
Robert Greenwalt
6201fc3bb7 am 313af5a3: Merge "Add Inet Condition log to bugreports" into gingerbread 
Merge commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a' into gingerbread-plus-aosp

* commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a':
  Add Inet Condition log to bugreports
 2010-09-20 21:31:29 -07:00
Robert Greenwalt
e0fb13866e Merge "Add Inet Condition log to bugreports" into gingerbread 2010-09-20 21:29:02 -07:00
Irfan Sheriff
e6f5e643e6 am df59f257: Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread 
Merge commit 'df59f257583730470085db65c7faf44960c3b32e' into gingerbread-plus-aosp

* commit 'df59f257583730470085db65c7faf44960c3b32e':
  DO NOT MERGE Enable debug in StatusBarService
 2010-09-20 20:02:32 -07:00
Irfan Sheriff
b98e0dd728 Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread 2010-09-20 19:51:39 -07:00
Mike Lockwood
4313b5a780 am 307aef01: Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread 
Merge commit '307aef01257cbba42f095f7020a4a3b753f3807b' into gingerbread-plus-aosp

* commit '307aef01257cbba42f095f7020a4a3b753f3807b':
  LocationManager: Hide location provider and geocode provider APIs.
 2010-09-20 17:19:04 -07:00
Mike Lockwood
abbf805c91 Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread 2010-09-20 17:16:03 -07:00
Dianne Hackborn
44bfeb931d am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread 
Merge commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15' into gingerbread-plus-aosp

* commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15':
  DO NOT MERGE.  Wifi service now blames apps for its wake lock use.
 2010-09-20 17:06:12 -07:00
Dianne Hackborn
2f516cddac Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread 2010-09-20 17:03:15 -07:00
Dianne Hackborn
295b9e65f0 am 4db643eb: Merge "In theory the package manager now scans /vendor/app" into gingerbread 
Merge commit '4db643eb8430d063b1adc4ba164bfa1c1281bdf3' into gingerbread-plus-aosp

* commit '4db643eb8430d063b1adc4ba164bfa1c1281bdf3':
  In theory the package manager now scans /vendor/app
 2010-09-20 16:57:05 -07:00
Dianne Hackborn
6473500135 Merge "In theory the package manager now scans /vendor/app" into gingerbread 2010-09-20 16:54:22 -07:00
Scott Main
259c28f6f0 am a4270e7e: am 73e150c8: provide link to backup guide above the fold 
Merge commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa' into gingerbread-plus-aosp

* commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa':
  provide link to backup guide above the fold
 2010-09-20 16:40:46 -07:00
Scott Main
37f2d1a005 am 73e150c8: provide link to backup guide above the fold 
Merge commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed' into gingerbread

* commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed':
  provide link to backup guide above the fold
 2010-09-20 16:37:32 -07:00
Dianne Hackborn
dd7b6bb3f9 am 8e1b84e7: Merge "Some battery improvements:" into gingerbread 
Merge commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b' into gingerbread-plus-aosp

* commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b':
  Some battery improvements:
 2010-09-20 16:34:45 -07:00
Dianne Hackborn
95ca338d1a Merge "Some battery improvements:" into gingerbread 2010-09-20 16:29:42 -07:00
Mindy Pereira
fb744481e5 am d3301e9f: Add mdpi images for overscroll EdgeGlow. 
Merge commit 'd3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c' into gingerbread-plus-aosp

* commit 'd3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c':
  Add mdpi images for overscroll EdgeGlow.
 2010-09-20 15:49:51 -07:00
Steve Howard
4f2f7f6421 am d2319d8d: Merge "New error status for "destination file already exists"." into gingerbread 
Merge commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1' into gingerbread-plus-aosp

* commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1':
  New error status for "destination file already exists".
 2010-09-20 15:43:43 -07:00
Steve Howard
642b2d271d Merge "New error status for "destination file already exists"." into gingerbread 2010-09-20 15:40:41 -07:00
John Wang
bf7dd2c98f am ee2ef322: Merge "Use PhoneBase in the phone list." into gingerbread 
Merge commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6' into gingerbread-plus-aosp

* commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6':
  Use PhoneBase in the phone list.
 2010-09-20 15:38:40 -07:00
John Wang
6a9165006d Merge "Use PhoneBase in the phone list." into gingerbread 2010-09-20 15:35:02 -07:00
Brian Swetland
d77cec91b0 am 181e5ea8: Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread 
Merge commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760' into gingerbread-plus-aosp

* commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760':
  support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
 2010-09-20 14:08:46 -07:00
Brian Swetland
ef7b152fad Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread 2010-09-20 14:05:25 -07:00
Brian Swetland
2b9e4f6a24 support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl 
Change-Id: Idd9ca85ce3ba6c92234375071b53e5365e689062
 2010-09-20 12:58:15 -07:00
Hung-ying Tyan
63c117f5be am 8544560c: SipPhone: fix missing-call DisconnectCause feedback 
Merge commit '8544560ccc43de7ff49d91866f461f5572f0b147' into gingerbread-plus-aosp

* commit '8544560ccc43de7ff49d91866f461f5572f0b147':
  SipPhone: fix missing-call DisconnectCause feedback
 2010-09-20 00:51:07 -07:00
Hung-ying Tyan
64ec5c1f2a am b17eae9e: SipService: move event handling out of system server\'s main thread 
Merge commit 'b17eae9e227475a323f61519abc8a7d35ddf8828' into gingerbread-plus-aosp

* commit 'b17eae9e227475a323f61519abc8a7d35ddf8828':
  SipService: move event handling out of system server's main thread
 2010-09-19 19:14:30 -07:00
Hung-ying Tyan
f5b3d27bd7 am 97963794: SIP: convert enum to static final int. 
Merge commit '97963794af1e18674dd111e3ad344d90b16c922c' into gingerbread-plus-aosp

* commit '97963794af1e18674dd111e3ad344d90b16c922c':
  SIP: convert enum to static final int.
 2010-09-19 18:56:27 -07:00
Hung-ying Tyan
2ddd3e119d am 5b930c49: Merge "SIP: add config flag for wifi-only configuration." into gingerbread 
Merge commit '5b930c49b12bdb1461a18491db768c642c38d498' into gingerbread-plus-aosp

* commit '5b930c49b12bdb1461a18491db768c642c38d498':
  SIP: add config flag for wifi-only configuration.
 2010-09-19 18:11:44 -07:00
Hung-ying Tyan
ad50813521 Merge "SIP: add config flag for wifi-only configuration." into gingerbread 2010-09-19 18:02:13 -07:00
Mike Lockwood
376cdd6d59 am ba56dfce: DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events 
Merge commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b' into gingerbread-plus-aosp

* commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b':
  DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
 2010-09-19 11:10:57 -07:00
Adam Powell
cc89e1208f am 4258bfb7: Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread 
Merge commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1' into gingerbread-plus-aosp

* commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1':
  Fix some drawing artifacts/bugs around overlays/text anchors
 2010-09-17 19:30:03 -07:00
Jeff Brown
7fa048f295 am 7d4739be: Merge "Reduce lock thrashing in native Looper." into gingerbread 
Merge commit '7d4739bed5cd5f41ddfa431446b51f61b94d7b0b' into gingerbread-plus-aosp

* commit '7d4739bed5cd5f41ddfa431446b51f61b94d7b0b':
  Reduce lock thrashing in native Looper.
 2010-09-17 19:29:50 -07:00
Adam Powell
1f6bf40676 Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread 2010-09-17 19:15:38 -07:00
Jeff Brown
1396874273 Merge "Reduce lock thrashing in native Looper." into gingerbread 2010-09-17 17:26:02 -07:00