ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,463 Commits 2 Branches 0 Tags 54 MiB
8fdedfd3d3
Commit Graph

32463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
8fdedfd3d3 am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 
* commit 'f13eb8301f4704179938e374129f2943c9c38d5f':
  Add auto-restore timeout for secondary networks.
 2011-05-04 10:02:16 -07:00
Robert Greenwalt
9f7aa4c665 Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 2011-05-04 09:59:30 -07:00
Mike Lockwood
2d479be9c6 am 36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath() 
* commit '36132a488b2974db9a90da809c2f3eeab99a4427':
  DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
 2011-05-04 08:57:59 -07:00
Mike Lockwood
609e1d9ac6 am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic 
* commit '8b1c74f96f93195326907db1bb07a3787a1c1b45':
  DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
 2011-05-04 08:57:56 -07:00
Mike Lockwood
8ee4a063c1 am a792c804: DO NOT MERGE MTP: Implement GetThumb command 
* commit 'a792c804025e25eb8a110d1db63f26bbd09e0e6b':
  DO NOT MERGE MTP: Implement GetThumb command
 2011-05-04 08:57:47 -07:00
Mike Lockwood
0910f9ac14 am af50821b: DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions 
* commit 'af50821bace87aa83c7faba7bf139cfcaccf317a':
  DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
 2011-05-04 08:57:44 -07:00
Mike Lockwood
b1771c1290 am fdb50e6f: DO NOT MERGE MTP: Add extended operations to support in-place editing of files 
* commit 'fdb50e6f8eaac31010b64fc79a60dacb5f776613':
  DO NOT MERGE MTP: Add extended operations to support in-place editing of files
 2011-05-04 08:57:41 -07:00
Mike Lockwood
8e8b339f8b am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider 
* commit 'fb6232635d339c83ca100e472b159f103dafb6e2':
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
 2011-05-04 08:57:37 -07:00
Marco Nelissen
6b4abeb8b3 am 7dd59229: DO NOT MERGE Fix media scanner uri handling. 
* commit '7dd592298aefb7921afb86ced444d46cb30ac466':
  DO NOT MERGE Fix media scanner uri handling.
 2011-05-04 08:57:33 -07:00
Mike Lockwood
a2b52f231f am c535f7f2: DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE" 
* commit 'c535f7f291f0bda688efcee62f21cf44d0ebe38e':
  DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
 2011-05-04 08:57:29 -07:00
Mike Lockwood
259d650c71 am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices: 
* commit 'd3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa':
  DO NOT MERGE MTP and media provider support for multiple storage devices:
 2011-05-04 08:57:23 -07:00
Mike Lockwood
dbd90e4157 am 10fbba21: DO NOT MERGE MountService: Fix running media scanner at boot. 
* commit '10fbba21e4827a1582d97aa99e4e8d772ce04920':
  DO NOT MERGE MountService: Fix running media scanner at boot.
 2011-05-04 08:57:19 -07:00
Mike Lockwood
c45fd5afb4 am 0aa5d7b7: DO NOT MERGE Fix deadlock in MountService 
* commit '0aa5d7b7f225236ac8461d0b6835b9c6152a2699':
  DO NOT MERGE Fix deadlock in MountService
 2011-05-04 08:57:12 -07:00
Mike Lockwood
e5f7a9501f am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
* commit 'e3b498be0ae05367e9b84f4fac2ac5cf57a6b091':
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
 2011-05-04 08:57:07 -07:00
Mike Lockwood
6bf48f70f6 am 346a2d79: DO NOT MERGE MountService: Add support for multiple volumes 
* commit '346a2d79ecd627e38bc7fc6874fb627995b8bc12':
  DO NOT MERGE MountService: Add support for multiple volumes
 2011-05-04 08:56:55 -07:00
Robert Ly
af35bf6440 am 88741823: am 7c2d14d5: Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1 
* commit '88741823a67fd8246b3926464bfaa2081b330f40':
  Doc change: fixing minor bug for xml resources bug 4376713
 2011-05-03 16:59:34 -07:00
Glenn Kasten
9cff62220f am 3b698d18: am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1 
* commit '3b698d181b7f165c9b31f7d74be19a5ed7575347':
  Account for race condition when attaching HDMI.
 2011-05-03 16:59:31 -07:00
Robert Ly
68cc53fe03 am 7c2d14d5: Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1 
* commit '7c2d14d59637cfb06ebcfbb091541cebd131fc6a':
  Doc change: fixing minor bug for xml resources bug 4376713
 2011-05-03 16:57:52 -07:00
Glenn Kasten
3d8070ba89 am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1 
* commit '9d8c6215d1aedb1e9f2e10c63e737427f13be884':
  Account for race condition when attaching HDMI.
 2011-05-03 16:57:45 -07:00
Robert Ly
f8647fc367 Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1 2011-05-03 16:54:21 -07:00
Glenn Kasten
efd763ded8 Merge "Account for race condition when attaching HDMI." into honeycomb-mr1 2011-05-03 16:46:12 -07:00
Wink Saville
2ed006842b am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE 
* commit '3ed0a1ec7aa6364c236721a1bd29fd196f259cba':
  IMS: Provide net_admin permission so that IPSec could be configured/used.
 2011-05-03 16:33:08 -07:00
Wink Saville
b71fa02d0d Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE 2011-05-03 16:19:58 -07:00
Conley Owens
d330455c29 am eac835e5: am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit 'eac835e52e8378b33a2b34b7edb803290154588d':
  Removing dead store; it was likely a relict of debuging code.
 2011-05-03 16:14:31 -07:00
Dan Morrill
78419fd016 am 75c66458: am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible. 
* commit '75c664582c5ce5d94826f37cb725b447a4d62c50':
  Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
 2011-05-03 12:46:20 -07:00
Dan Morrill
95bf307d34 am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible. 
* commit '8325c3a89197e47cfc2eeb4117c927fb8cb91630':
  Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
 2011-05-03 12:26:16 -07:00
Conley Owens
1c4c6b4581 am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit '9c4ba2580e2ef582747cce2960804a2a5e4b776e':
  Removing dead store; it was likely a relict of debuging code.
 2011-05-03 12:07:19 -07:00
Wink Saville
d05bbd383d am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE 
* commit 'd0d44c4e988ecdea86c2bb04e29d8f6d20c1c631':
  Make DataConnection asynchronous.
 2011-05-02 23:44:16 -07:00
Wink Saville
1c503c26e0 Merge "Make DataConnection asynchronous." into honeycomb-LTE 2011-05-02 23:41:29 -07:00
Robert Greenwalt
8fa31b3a39 am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 
* commit 'a47c40193fcbe9ca07facea78b2828afdae5e025':
  Add RouteInfo objects for tracking routes.
 2011-05-02 13:29:22 -07:00
Robert Greenwalt
62bcdb5f45 Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 2011-05-02 13:26:52 -07:00
Irfan Sheriff
2f31356a2a am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 
* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
  Add DhcpStateMachine for interation with dhcpcd
 2011-05-02 12:26:52 -07:00
Wink Saville
745fa56f9a am 7e74c60d: Merge "Enhance AsyncChannel." into honeycomb-LTE 
* commit '7e74c60db5261ea137c8f6672f8573873eb5814e':
  Enhance AsyncChannel.
 2011-05-02 11:51:36 -07:00
Wink Saville
c2e50cd772 am aa44b52e: Fix bug in RIL#getDataCallState. 
* commit 'aa44b52ee07eb4937d23bb3c2464007a2eb3f50f':
  Fix bug in RIL#getDataCallState.
 2011-05-02 11:51:20 -07:00
Irfan Sheriff
581b155a43 Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 2011-05-02 11:49:46 -07:00
Wink Saville
9b81f6b0c1 Merge "Enhance AsyncChannel." into honeycomb-LTE 2011-05-02 10:47:05 -07:00
Conley Owens
d1820ffeb9 Merge "Removing dead store; it was likely a relict of debuging code." 2011-05-02 09:53:25 -07:00
Conley Owens
ec732cdb6b Merged "Adjust mBiggerTouchSlopSquare to the suitable value" 
Conflicts:
	core/java/android/view/ViewConfiguration.java

Change-Id: I74de006dbb19fd878591bc90955a1c6e74aa084e
 2011-04-29 17:49:06 -07:00
Conley Owens
bc2d5e4146 Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m 
Conflicts:
	core/java/android/widget/ScrollView.java

Change-Id: I1cfd3f7091e92793ce9fa048a09ae08a04c10c80
 2011-04-29 17:35:29 -07:00
Conley Owens
ecd5f1cc40 am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string" 
* commit '19653c6440eaf7328ecbc01c3ca6d7a910906484':
  CHAR_SEQUENCE_CREATOR cannot handle null string
 2011-04-29 17:15:39 -07:00
Conley Owens
7badf9c5e8 am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" 
* commit 'a47c0d29bec7c242fb8d5ffe206c4c6ff85a178a':
  Fixed to draw texture when loadTexture() is called at first time
 2011-04-29 17:15:35 -07:00
Conley Owens
68bf2355c7 am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter." 
* commit '520dd927cbe02ae52add1f90e282750582a9e95e':
  Fixing wrong Japanese phone formatter.
 2011-04-29 17:15:13 -07:00
Conley Owens
9b4283d6a2 am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class" 
* commit '718516f3b73468c480ef8d2283a1c80a6223658d':
  Fix memory leak of SkMovie class
 2011-04-29 17:15:09 -07:00
Conley Owens
0273caeeaa Ignore ALT and SHIFT modifiers since they now exist in libs/ui/KeyCharacterMap.cpp 2011-04-29 17:12:22 -07:00
Conley Owens
7eed38dc6c am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > 
* commit '1a846ab089878a6b342c6bc3e8850fc2e0ef3080':
  Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
 2011-04-29 17:07:14 -07:00
Conley Owens
9392afe94a Ignore slide ui change because it is obselete in newly-refactored code 2011-04-29 17:04:25 -07:00
Conley Owens
9428ff9f9c am af99655e: am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact" 
* commit 'af99655e51ac549b7ef664141d676299ef48f3c0':
  Adding missing breaks in BnSurfaceComposer::onTransact
 2011-04-29 16:58:26 -07:00
Conley Owens
91461ae1a2 Ignore fix since it is obsolete in newly refactored code 2011-04-29 16:55:43 -07:00
Conley Owens
a6aa9d9e66 am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only when needed" 
* commit '52749c0b1117a05a9c853b7d54f69a281f69cf3c':
  frameworks/base: acquire lock on am only when needed
 2011-04-29 16:44:20 -07:00
Conley Owens
d3241ca3fa am e321d064: am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()" 
* commit 'e321d06430304fa93282c765aa6070c908121a16':
  Adding a sanity test in the while loop in readHistory()
 2011-04-29 16:44:14 -07:00