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

19295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
ad34e3b167 Merge "Add shutdown assurance" into gingerbread 2010-10-13 13:19:25 -07:00
Wink Saville
67047d53d0 am 07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbread 
Merge commit '07e1be62c7a8650313e7ad8690968c58ec8e88ad' into gingerbread-plus-aosp

* commit '07e1be62c7a8650313e7ad8690968c58ec8e88ad':
  Fix NPE caused by Change I4df27119.
 2010-10-13 12:27:22 -07:00
Scott Main
7823e1a6c4 am eb4ef072: am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494 
Merge commit 'eb4ef07223030eb61d8cf99771e657b7fc0108d0' into gingerbread-plus-aosp

* commit 'eb4ef07223030eb61d8cf99771e657b7fc0108d0':
  docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
 2010-10-13 12:27:08 -07:00
Wink Saville
3ac8dfcb03 Merge "Fix NPE caused by Change I4df27119." into gingerbread 2010-10-13 12:17:05 -07:00
Scott Main
e4c9d8e8ed am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494 
Merge commit '5249ad03454301744374d04e04b38aaad3b01530' into gingerbread

* commit '5249ad03454301744374d04e04b38aaad3b01530':
  docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
 2010-10-13 12:08:02 -07:00
Nick Pelly
e863e66640 am 527d8bbd: Merge "Add missing native methods to fix boot." into gingerbread 
Merge commit '527d8bbd79c1ff2b6e24d19fe9e7a1ecdb72891a' into gingerbread-plus-aosp

* commit '527d8bbd79c1ff2b6e24d19fe9e7a1ecdb72891a':
  Add missing native methods to fix boot.
 2010-10-13 10:18:58 -07:00
Nick Pelly
6e6864a54b Merge "Add missing native methods to fix boot." into gingerbread 2010-10-13 10:16:49 -07:00
Andreas Huber
77222360df am 312644cd: Merge "Support for writing to MPEG2 transport stream files." into gingerbread 
Merge commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp

* commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7':
  Support for writing to MPEG2 transport stream files.
 2010-10-13 09:19:28 -07:00
Andreas Huber
45c10062f8 am 165c6579: Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread 
Merge commit '165c6579660c22edafb61fee2a0cf39334a2a905' into gingerbread-plus-aosp

* commit '165c6579660c22edafb61fee2a0cf39334a2a905':
  HTTP Live content that are tagged as complete are now seekable.
 2010-10-13 09:17:13 -07:00
Andreas Huber
debb3a6be9 Merge "Support for writing to MPEG2 transport stream files." into gingerbread 2010-10-13 09:14:40 -07:00
Andreas Huber
5558435e53 Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread 2010-10-13 09:14:13 -07:00
Leon Scroggins
c9adb8d26f am dfc07279: Line up WebTextView text with the page. 
Merge commit 'dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4' into gingerbread-plus-aosp

* commit 'dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4':
  Line up WebTextView text with the page.
 2010-10-13 07:56:38 -07:00
Mike Lockwood
08fa659cc4 am c792c2e9: Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread 
Merge commit 'c792c2e9edb3c785208560b6961ac6ed5b07eb4e' into gingerbread-plus-aosp

* commit 'c792c2e9edb3c785208560b6961ac6ed5b07eb4e':
  GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
 2010-10-13 05:52:51 -07:00
Mike Lockwood
91a2e55166 Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread 2010-10-13 05:46:15 -07:00
Justin Ho
a8003e8afc am e03471e1: Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 
Merge commit 'e03471e12f1adcd818b5bfd9dcb894c75fe955c5' into gingerbread-plus-aosp

* commit 'e03471e12f1adcd818b5bfd9dcb894c75fe955c5':
  Updated popup_ 9 patches and removing text_select_handle (hdpi)
 2010-10-12 20:32:56 -07:00
Justin Ho
137ef22cef Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 2010-10-12 20:30:36 -07:00
Justin Ho
e867b1c1ef am 33bae9b8: Updated lockscreen asset (Hiroshi), new menu background 
Merge commit '33bae9b826145677585a2171f4986d4c6433fd0d' into gingerbread-plus-aosp

* commit '33bae9b826145677585a2171f4986d4c6433fd0d':
  Updated lockscreen asset (Hiroshi), new menu background
 2010-10-12 20:24:37 -07:00
Hung-ying Tyan
d516490fcb am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread 
Merge commit 'f1b1eec9de1ca27b660f6c00487de07a30eecf64' into gingerbread-plus-aosp

* commit 'f1b1eec9de1ca27b660f6c00487de07a30eecf64':
  SipService: mScreenOn is flipped to wrong value.
 2010-10-12 19:46:14 -07:00
Hung-ying Tyan
7daf32433a Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread 2010-10-12 19:44:17 -07:00
Nick Pelly
3b0bf69242 am ab39f1ef: Merge "Fix build." into gingerbread 
Merge commit 'ab39f1ef13a546e38b49bfc02dca2ec771c13831' into gingerbread-plus-aosp

* commit 'ab39f1ef13a546e38b49bfc02dca2ec771c13831':
  Fix build.
 2010-10-12 19:25:57 -07:00
Nick Pelly
9bf9f7a444 Merge "Fix build." into gingerbread 2010-10-12 19:23:13 -07:00
Dianne Hackborn
1fe33e2c77 am 259c8499: Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" into gingerbread 
Merge commit '259c849989ccd30b0bb4569d11f125ed2c0c1911' into gingerbread-plus-aosp

* commit '259c849989ccd30b0bb4569d11f125ed2c0c1911':
  Fix issue #3089800: adb shell am -W causes ActivityManager crash
 2010-10-12 19:08:49 -07:00
Dianne Hackborn
f0908a156c Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" into gingerbread 2010-10-12 19:06:37 -07:00
Jaikumar Ganesh
fd6b7eec66 am 64f42803: Merge "Bluez doesn\'t handle disconnect while connecting well. Defer the message." into gingerbread 
Merge commit '64f4280313c5b498a3238d174c4d14ca2187604b' into gingerbread-plus-aosp

* commit '64f4280313c5b498a3238d174c4d14ca2187604b':
  Bluez doesn't handle disconnect while connecting well.
 2010-10-12 19:06:13 -07:00
Jaikumar Ganesh
1f5843c4d2 Merge "Bluez doesn't handle disconnect while connecting well. Defer the message." into gingerbread 2010-10-12 19:02:46 -07:00
Nick Pelly
ae9dfe8fe7 am 590b73bc: NFC API revision round 2. 
Merge commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6' into gingerbread-plus-aosp

* commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6':
  NFC API revision round 2.
 2010-10-12 19:00:54 -07:00
Justin Ho
5511fed2a4 am 45738f67: Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread 
Merge commit '45738f6700cff689eacda7c8192b76939ba20591' into gingerbread-plus-aosp

* commit '45738f6700cff689eacda7c8192b76939ba20591':
  Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)
 2010-10-12 17:40:47 -07:00
Justin Ho
c2dc99c3ca Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread 2010-10-12 17:38:44 -07:00
Hung-ying Tyan
7225fff288 am 907f6f1d: Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread 
Merge commit '907f6f1d7d13531015b545861b93e1607d253cfd' into gingerbread-plus-aosp

* commit '907f6f1d7d13531015b545861b93e1607d253cfd':
  Fix SipSessionGroup from throwing ConcurrentModificationException
 2010-10-12 17:37:38 -07:00
Hung-ying Tyan
3874b18c1d Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread 2010-10-12 17:33:27 -07:00
Adam Powell
d3b93334e8 am c417612a: Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread 
Merge commit 'c417612a1abb6281697a9738a1a19eb8814ae8a6' into gingerbread-plus-aosp

* commit 'c417612a1abb6281697a9738a1a19eb8814ae8a6':
  Fix bug 3083631 - Links no longer get tapped during scale gestures
 2010-10-12 17:11:51 -07:00
Adam Powell
308ddf283c Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread 2010-10-12 17:08:43 -07:00
Jaikumar Ganesh
d3a7abfb57 am 1bc3a407: Merge "Fix auto connection priority handling." into gingerbread 
Merge commit '1bc3a407ceb380e35e894f405f544b5b87e980d4' into gingerbread-plus-aosp

* commit '1bc3a407ceb380e35e894f405f544b5b87e980d4':
  Fix auto connection priority handling.
 2010-10-12 16:50:45 -07:00
Jaikumar Ganesh
6cd9eff46d Merge "Fix auto connection priority handling." into gingerbread 2010-10-12 16:46:50 -07:00
Jeff Brown
5dadf31860 am fa3d9557: Merge "Add text selection handles to preloaded drawables." into gingerbread 
Merge commit 'fa3d9557c8178e9c4b9471a76edcf4d48a5b3551' into gingerbread-plus-aosp

* commit 'fa3d9557c8178e9c4b9471a76edcf4d48a5b3551':
  Add text selection handles to preloaded drawables.
 2010-10-12 16:12:34 -07:00
Jeff Brown
5cbba469d9 Merge "Add text selection handles to preloaded drawables." into gingerbread 2010-10-12 16:08:59 -07:00
Andy Stadler
2641d5af3f am 8e2be267: Add versionCode and versionName to dumpsys packages 
Merge commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58' into gingerbread-plus-aosp

* commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58':
  Add versionCode and versionName to dumpsys packages
 2010-10-12 15:25:34 -07:00
Adam Powell
0ae526e447 am fb6431c0: Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread 
Merge commit 'fb6431c0298747d240fcdc025575e5f46db95132' into gingerbread-plus-aosp

* commit 'fb6431c0298747d240fcdc025575e5f46db95132':
  Fix bug 3064135 - do not allow text handles on TextViews in sub windows.
 2010-10-12 15:03:29 -07:00
Adam Powell
4254081daf Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread 2010-10-12 15:00:30 -07:00
Irfan Sheriff
38f3f5cd6e am e22eb863: Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread 
Merge commit 'e22eb863dc4419dcaf329e9e28e3dc1f71f82902' into gingerbread-plus-aosp

* commit 'e22eb863dc4419dcaf329e9e28e3dc1f71f82902':
  fix start driver for corner cases DO NOT MERGE
 2010-10-12 14:59:20 -07:00
Irfan Sheriff
b7768f0fa5 Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread 2010-10-12 14:55:52 -07:00
Joe Onorato
296b1d7764 am ba799098: Merge changes I76513387,I335fb671 into gingerbread 
Merge commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp

* commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e':
  Remove dead code, and make the animation a setting.
  turn off the electron beam
 2010-10-12 14:46:23 -07:00
Joe Onorato
08f64b9e27 Merge changes I76513387,I335fb671 into gingerbread 
* changes:
  Remove dead code, and make the animation a setting.
  turn off the electron beam
 2010-10-12 14:43:24 -07:00
Wink Saville
27813b0a6b am a3100314: Merge "Remove some PII." into gingerbread 
Merge commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6' into gingerbread-plus-aosp

* commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6':
  Remove some PII.
 2010-10-12 14:21:10 -07:00
Dirk Dougherty
4187865cf2 am 354954a0: Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread 
Merge commit '354954a01c533c6789536c141cf330ddf3976e8b' into gingerbread-plus-aosp

* commit '354954a01c533c6789536c141cf330ddf3976e8b':
  Doc change: cherrypick testing changes from master. Squashed commit of the following:
 2010-10-12 14:18:33 -07:00
Wink Saville
e5865c7c4c Merge "Remove some PII." into gingerbread 2010-10-12 14:17:00 -07:00
Mathias Agopian
59119e658a turn off the electron beam 
Change-Id: I335fb6719f1d5a3f1c6f37a046fd1c2c4ed2bbc6
 2010-10-12 14:16:11 -07:00
Dirk Dougherty
05a1326c74 Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread 2010-10-12 14:16:05 -07:00
John Wang
b6be8d662f am 844a6b3c: Turn off additional debug. 
Merge commit '844a6b3ccaff1ad1443ad985e4527b733ce97c0e' into gingerbread-plus-aosp

* commit '844a6b3ccaff1ad1443ad985e4527b733ce97c0e':
  Turn off additional debug.
 2010-10-12 11:55:31 -07:00
Leon Scroggins
80e3b896cc am f348502c: Merge "Allow TextView to do its thing." into gingerbread 
Merge commit 'f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59' into gingerbread-plus-aosp

* commit 'f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59':
  Allow TextView to do its thing.
 2010-10-12 11:23:12 -07:00