ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
20,454 Commits 2 Branches 0 Tags 54 MiB
eb9d908d96
Commit Graph

20454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
eb9d908d96 Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 2011-03-11 14:22:22 -08:00
Dianne Hackborn
5b18439050 am 62619392: Merge "Fix leak when keylock is recreated." 
* commit '626193926df0b3c7236e5c244f30d797d9192e0d':
  Fix leak when keylock is recreated.
 2011-02-28 18:03:12 -08:00
Dianne Hackborn
b00d5d94d6 Merge "Fix leak when keylock is recreated." 2011-02-28 17:54:54 -08:00
Jaikumar Ganesh
03100c7446 am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT." 
* commit '1eefb529c78be5336f6c8a1b8ac2c32e268d4294':
  Phone crash when old callback func is woken up when enabling BT.
 2011-02-28 16:00:01 -08:00
Jaikumar Ganesh
51e164ad73 Merge "Phone crash when old callback func is woken up when enabling BT." 2011-02-28 15:33:34 -08:00
Jean-Baptiste Queru
3da332d6fa am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase." 
* commit 'e0537f1859664ba9c9cf87eb9d6dc3c16986dbb8':
  Fix of tearDown() in SingleLaunchActivityTestCase.
 2011-02-28 10:15:46 -08:00
Jean-Baptiste Queru
f9d33557e7 Merge "Fix of tearDown() in SingleLaunchActivityTestCase." 2011-02-28 10:12:08 -08:00
Xavier Ducrohet
4256fef269 am dff6b8e7: Merge "Add --non-constant-id to aapt." 
* commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
 2011-02-28 09:16:38 -08:00
Xavier Ducrohet
281cc9c8c0 Merge "Add --non-constant-id to aapt." 2011-02-24 15:59:26 -08:00
Wink Saville
e5ee1b5add Merge "WAPPushManager, WAP Push over SMS message handler" 2011-02-23 17:40:43 -08:00
Mike Lockwood
d5372b93e9 Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence" 2011-02-23 16:27:27 -08:00
Brad Fitzpatrick
34bfec131d Merge "Fixed GSM encoded network initiated position request" 2011-02-23 08:17:31 -08:00
Elliott Hughes
ddd5975296 Merge "Ensuring thread-safe usage of DateFormat." 2011-02-22 11:16:04 -08:00
Brad Fitzpatrick
a1ca28f78a Merge "Fix for an infinite loop while scrolling lists." 2011-02-22 10:55:44 -08:00
Brad Fitzpatrick
55d0e988b0 Merge "Fixing infinite loop for zero duration." 2011-02-22 08:23:23 -08:00
Romain Guy
d4cd30cbcf am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." 
* commit '7118bdec523568842e70555e353951df9f2596fd':
  Fix for #12945: ProgressBar.setMax() will always redraw.
 2011-02-18 07:53:50 -08:00
Romain Guy
2151cef42c Merge "Fix for #12945: ProgressBar.setMax() will always redraw." 2011-02-17 22:40:33 -08:00
Robert Ly
6619488871 am 322891c6: Doc change: nfc dev guide 
* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
  Doc change: nfc dev guide
 2011-02-11 13:18:31 -08:00
Jean-Baptiste Queru
fd32f41763 am 6901f963: am 93552de8: Merge "stubs" 
* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
  stubs
 2011-02-11 10:04:53 -08:00
Jean-Baptiste Queru
a240734bae am 93552de8: Merge "stubs" 
* commit '93552de8e305027fb003401e347b9493c64c981f':
  stubs
 2011-02-11 09:54:59 -08:00
Jean-Baptiste Queru
3edab5a44e Merge "stubs" 2011-02-11 09:39:46 -08:00
Steve Block
58c40337d0 stubs 
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
 2011-02-11 09:33:40 -08:00
Gilles Debunne
4dffae1718 am 2050de5b: Text selection is broken. 
* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
  Text selection is broken.
 2011-02-09 16:49:42 -08:00
Wink Saville
614a618526 am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation" 
* commit '01a5eba810bfdf5b111a7546814e174c1d57b6e7':
  Telephony: Fix cb sms implementation
 2011-02-09 13:45:37 -08:00
Wink Saville
76615d7b6f am 6e25789f: Merge "Telephony: Fix cb sms implementation" 
* commit '6e25789fbe7ac283021156b17f406acb48850292':
  Telephony: Fix cb sms implementation
 2011-02-09 13:42:45 -08:00
Wink Saville
0db20b9d86 Merge "Telephony: Fix cb sms implementation" 2011-02-09 13:09:24 -08:00
Mathias Agopian
4ed86b8f5c am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread 
* commit 'ada1b6f297596cac4451edbc83df060a31cdda68':
  fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
 2011-02-09 13:09:12 -08:00
Mathias Agopian
6cb8fc11ee Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread 2011-02-09 13:06:00 -08:00
Scott Main
32904147c2 am 07cefd3c: add 2.3.3 announcement to site home page 
* commit '07cefd3cc3d8d27750e4fc725d9aec86250750dd':
  add 2.3.3 announcement to site home page
 2011-02-09 13:03:11 -08:00
Jeff Hamilton
1ce30b2dfa am 58c9d472: Merge "More documentation updates for NFC." into gingerbread 
* commit '58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
  More documentation updates for NFC.
 2011-02-09 00:36:53 -08:00
Jeff Hamilton
0858b00d05 Merge "More documentation updates for NFC." into gingerbread 2011-02-09 00:34:22 -08:00
Dirk Dougherty
714319b575 am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread 
* commit 'a3f53afd13bc1722464e169cb82a01d3898852b5':
  Doc change: Add version notes for Android 2.3.3.
 2011-02-08 23:27:53 -08:00
Nick Pelly
3d7a394315 am 39cf3a44: Document NFC permissions. 
* commit '39cf3a445e507f219ecc8a476f6038f095d9d520':
  Document NFC permissions.
 2011-02-08 23:25:29 -08:00
Dirk Dougherty
6e0c56dfe3 Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread 2011-02-08 23:24:22 -08:00
Jeff Hamilton
b9e98d8c6a am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread 
* commit '584afa8dde1777b181e773a491416769f25607a8':
  Improve the docs a bit for foreground dispatch.
 2011-02-08 19:33:53 -08:00
Jeff Hamilton
c9cda41f02 Merge "Improve the docs a bit for foreground dispatch." into gingerbread 2011-02-08 19:30:47 -08:00
Eric Fischer
b5c24f2871 am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'be4b39d2fde3d34539752b99238ceebd97ccf580':
  Import revised translations.  DO NOT MERGE
 2011-02-08 17:32:18 -08:00
Scott Main
ace630d9c1 am 3c01a139: rename SIP doc title 
* commit '3c01a139f0d8ece0e300be26ac41280f1e934747':
  rename SIP doc title
 2011-02-08 17:32:14 -08:00
Scott Main
a12ed5ec38 am c442bc60: docs: move the SIP guide into guide/network/ 
* commit 'c442bc605c80a2900a0ed41345f53d218288de7a':
  docs: move the SIP guide into guide/network/
 2011-02-08 17:32:06 -08:00
Katie McCormick
5ffcfb88f0 am 7134520b: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API 
* commit '7134520b2635474c5e7f4902c26e12d0ffcc9c64':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
 2011-02-08 17:31:59 -08:00
Dirk Dougherty
1e6e960d66 am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread 
* commit '01967c0ee104e985167374e41f2c416c1100f767':
  Doc change: Add diff report for api 10.
 2011-02-08 17:31:54 -08:00
Gilles Debunne
2f630a5533 am cdfe8999: Fix for multiple merge problem. 
* commit 'cdfe899991c365d9e197d83f8859089cae082011':
  Fix for multiple merge problem.
 2011-02-08 17:31:33 -08:00
Gilles Debunne
a8b288d285 resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp 
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
 2011-02-08 16:33:58 -08:00
Eric Fischer
021223d742 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-02-08 10:00:24 -08:00
Dirk Dougherty
88902d0549 Merge "Doc change: Add diff report for api 10." into gingerbread 2011-02-07 17:21:56 -08:00
Brad Fitzpatrick
a9bc4da260 am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector" 
* commit 'b901c9abff6b3885e1efce2e643b1f8e5ef3fc79':
  Fix a race condition in NativeDaemonConnector
 2011-02-07 10:07:46 -08:00
Brad Fitzpatrick
16cd26a9cd am 9204644d: Merge "Fix a race condition in NativeDaemonConnector" 
* commit '9204644d9e8fc2a3d05ff386b14b349f7a117694':
  Fix a race condition in NativeDaemonConnector
 2011-02-07 10:04:54 -08:00
Brad Fitzpatrick
d9d203315c Merge "Fix a race condition in NativeDaemonConnector" 2011-02-07 09:55:34 -08:00
Dianne Hackborn
b68bef3b70 am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition." 
* commit '4b7c1cacca252f735d23f7e01885214630d83f32':
  Fixing possible race condition.
 2011-02-07 07:51:34 -08:00
Dianne Hackborn
6de8529af6 am bb2e1ef8: Merge "Fixing possible race condition." 
* commit 'bb2e1ef87fe4c5123340035766c759155e6bb90c':
  Fixing possible race condition.
 2011-02-07 07:33:38 -08:00