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

32440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Conley Owens
b91ac99cbd am 7bcb2f39: am c5505f6a: Merge "Improved conversion accuracy of exif geotag data" 
* commit '7bcb2f39154e7d4271486674c5a6db5756de6c29':
  Improved conversion accuracy of exif geotag data
 2011-04-29 16:44:08 -07:00
Conley Owens
811a5fa747 Ignore broken image fix since identical change exists in internal tree 2011-04-29 16:40:38 -07:00
Wink Saville
aeb8096e60 am 6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE 
* commit '6e748780ef01174235975508090f2e0af6c16d4d':
  CDMALTE: Evaluate data network type in pollStateDone()
 2011-04-29 16:17:58 -07:00
Wink Saville
75bb55b0bb Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE 2011-04-29 16:12:59 -07:00
Scott Main
8b6be1a8cf am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit '511ec082bb198cfd04aebdccf56db6f4c8df9523':
  docs: more documentation for ProgressBar
 2011-04-29 15:05:10 -07:00
Scott Main
7d2fef4399 am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit 'de506220d8a3d453463e1abe1b2eb54afd48ec93':
  docs: more documentation for ProgressBar
 2011-04-29 14:59:08 -07:00
Conley Owens
9d09b81e22 am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()" 
* commit '54668b8a3599559fc007af1d75c039400a05e898':
  Added null check on return value for getKeyDispatcherState()
 2011-04-29 14:57:53 -07:00
Conley Owens
460913981a am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here." 
* commit 'f26ec38c344af8cf91575b461028a3033b940d49':
  Eliminating dead logic - bitmap state simply cannot be null here.
 2011-04-29 14:57:18 -07:00
Conley Owens
b930fb22b2 am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation." 
* commit 'eef8f148881f39feb0b1aded121bbfc63e8d30c2':
  Removing unnecessary computation.
 2011-04-29 14:57:10 -07:00
Conley Owens
34483e7494 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 2011-04-29 14:56:59 -07:00
Conley Owens
deed89f468 am 8b22ef66: am e41d2aed: Merge "Using robust equality check." 
* commit '8b22ef66ef1a67333e2f1d4250d2c134b50ef91a':
  Using robust equality check.
 2011-04-29 14:56:15 -07:00
Scott Main
d044b56913 am 205d6fb3: am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers 
* commit '205d6fb38d3c39a39ee9721b0d8e3649afacad18':
  docs: tweak table headers for config qualifiers
 2011-04-29 14:56:06 -07:00
Conley Owens
e8b95726a9 am a9517012: am 1e29552b: Merge "We don\'t need these local references." 
* commit 'a95170122619f5442d5efbdf2e37f91dbf455ab9':
  We don't need these local references.
 2011-04-29 14:56:05 -07:00
Conley Owens
b3ac5eab4f am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life." 
* commit 'd66a92e6875bfc835adf0b100607afbf4bfc2761':
  Eliminating dead code with no other effect than consuming battery life.
 2011-04-29 14:55:55 -07:00
Scott Main
0d1ed0af4a am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit '1462813a28270d4255f9542b666960182e274a6e':
  docs: more documentation for ProgressBar
 2011-04-29 14:55:43 -07:00
Conley Owens
a7fe45cd87 am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message" 
* commit '893812b2ee4a640ad398f7f79f90b92d52a5f3b1':
  Remove duplicate '=' in exception message
 2011-04-29 14:55:35 -07:00
James Dong
73e73d573e am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge. 
* commit 'f181e416ee3f104e79be2c2a76e9c1c25a214e17':
  Add avg bandwidth estimate every 2 seconds - do not merge.
 2011-04-29 14:53:30 -07:00
Scott Main
8e06acecc4 Merge "docs: more documentation for ProgressBar" into honeycomb 2011-04-29 14:52:20 -07:00
Scott Main
b858714b8d am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers 
* commit 'be2da3c9b64c7ced6acc9933e0b941a8ee4239fb':
  docs: tweak table headers for config qualifiers
 2011-04-29 14:46:28 -07:00
James Dong
aad1ad8fd4 am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge. 
* commit 'ec78f551b575b0274cbe796f8e08a9df1a706680':
  Add avg bandwidth estimate every 2 seconds - do not merge.
 2011-04-29 14:42:58 -07:00
Scott Main
34db3e567e am c7eb47fa: docs: tweak table headers for config qualifiers 
* commit 'c7eb47fad4fe39bd85c6205e38426c1867b9ed92':
  docs: tweak table headers for config qualifiers
 2011-04-29 14:42:55 -07:00
Conley Owens
2f56d20cb0 am eb8171bc: Merge "Adjust mBiggerTouchSlopSquare to the suitable value" 
* commit 'eb8171bcff9bd980dbdfc99b2d843a5bcc0ae3e5':
  Adjust mBiggerTouchSlopSquare to the suitable value
 2011-04-29 10:24:34 -07:00
Conley Owens
05e4042a1e am 76616b13: Merge "Scolling using arrow keys with padding" 
* commit '76616b138eb68a77a838a93fdf2f0322e982f706':
  Scolling using arrow keys with padding
 2011-04-29 10:24:29 -07:00