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

33498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
b2531a836b Resolve merge conflicts for merge of 21083066 to master. 
Change-Id: Ief83f7abdd3396af965fb86ad6815e16ce36ff5c
 2011-05-02 12:13:44 -07:00
Wink Saville
3a1c7d2601 am 0fa7d106: am aa44b52e: Fix bug in RIL#getDataCallState. 
* commit '0fa7d106d4e34559c6e208f731c319cf681c0583':
  Fix bug in RIL#getDataCallState.
 2011-05-02 12:05:02 -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
Wink Saville
9b81f6b0c1 Merge "Enhance AsyncChannel." into honeycomb-LTE 2011-05-02 10:47:05 -07:00
Conley Owens
e9981208de am a3dcd0a3: (-s ours) Merged "Adjust mBiggerTouchSlopSquare to the suitable value" 
* commit 'a3dcd0a3f1b48fc0d675db7e32c27415a14f6d08':
  Adjust mBiggerTouchSlopSquare to the suitable value
 2011-05-02 10:37:40 -07:00
Conley Owens
8abc2b7d1a am dddaa56f: Merge commit \'b737647d\' (Scrolling using arrow keys with padding) into m 
* commit 'dddaa56f793ad9ecb4e20df746f562ac7f24d158':
  Scolling using arrow keys with padding
 2011-05-02 10:28:26 -07:00
Conley Owens
4c30f1027a Merge commit 'f395e304' into m 
Conflicts:
	core/tests/coretests/src/android/text/TextUtilsTest.java

Change-Id: I7439f7f80cf91ff654c0ddd79c3e6b3808ba4784
 2011-05-02 10:25:55 -07:00
Conley Owens
5511a49d8d am 08acaec6: am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" 
* commit '08acaec6df66bd6a12b1e63016ed998abff4afdc':
  Fixed to draw texture when loadTexture() is called at first time
 2011-05-02 10:12:00 -07:00
Conley Owens
36f57da49a am 737b5c58: am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter." 
* commit '737b5c58c9094e5759bd4162f23f73be2b71faaf':
  Fixing wrong Japanese phone formatter.
 2011-05-02 10:11:56 -07:00
Conley Owens
a46dda381f am 1eb31b43: am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class" 
* commit '1eb31b434fdc325c55b65ecf1783c63b2fdfa669':
  Fix memory leak of SkMovie class
 2011-05-02 10:11:52 -07:00
Conley Owens
6d1298f4f6 am 64248af3: Ignore ALT and SHIFT modifiers since they now exist in libs/ui/KeyCharacterMap.cpp 
* commit '64248af314593fe8ffed57ac9a0f43dede26bfc2':
  Implement support for ALT and SHIFT modifiers
 2011-05-02 10:11:48 -07:00
Conley Owens
8a335fe73f am c30d7676: 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 
* commit 'c30d767628861b0bbea907824682e47732c820f9':
  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-05-02 10:11:43 -07:00
Conley Owens
3ddb5a11e3 am faedfc1e: Ignore slide ui change because it is obselete in newly-refactored code 
* commit 'faedfc1e9be10ab29d563b7aede57cdac6e44799':
  modify the device to enable to get the state as slide-open/slide-close.
 2011-05-02 10:11:39 -07:00
Conley Owens
de7c0f4727 am 238ef85e: am af99655e: am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact" 
* commit '238ef85eb6894408c5a59cdb93405001c972f450':
  Adding missing breaks in BnSurfaceComposer::onTransact
 2011-05-02 10:11:34 -07:00
Conley Owens
6d9b67054f am 0921eae1: Ignore fix since it is obsolete in newly refactored code 
* commit '0921eae141eebbe52762d4a1cde0edf98fefbda2':
  Fixed to call computeVisibleRegions() when transparent value changed
 2011-05-02 10:11:29 -07:00
Conley Owens
1dd6ef0797 am 92618f5f: am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only when needed" 
* commit '92618f5fd9e4a0469d60cab39765b7c820c1976b':
  frameworks/base: acquire lock on am only when needed
 2011-05-02 10:11:11 -07:00
Conley Owens
96780f4ce5 Merge commit '5eb49e0f' into m 
Conflicts:
	core/java/com/android/internal/os/BatteryStatsImpl.java

Change-Id: Idc9c84c2ca7dec2540ceccead7927fddb912ff12
 2011-05-02 09:59:30 -07:00
Conley Owens
aa2f34f478 am ba40174b: am 7bcb2f39: am c5505f6a: Merge "Improved conversion accuracy of exif geotag data" 
* commit 'ba40174bc02f35aa2f6339a04de4f8993f2cd750':
  Improved conversion accuracy of exif geotag data
 2011-04-29 18:08:16 -07:00
Conley Owens
0156ca81d9 am 33e86de0: Ignore broken image fix since identical change exists in internal tree 
* commit '33e86de0af31d16acda140d8dc45a256b2509211':
  Fixes broken image link in "Tools -> Traceview" documentation page.
 2011-04-29 18:08:06 -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
Stephen Hines
bf89e85d56 Merge "Fix bug 4355588 With auto inbanding the fifo didn't reserve the correct size. Caused failure on fifo wrap." 2011-04-29 16:37:46 -07:00
Gloria Wang
d87f8f5ca4 Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947" 2011-04-29 16:35:26 -07:00
Wink Saville
a37b9649c7 am dd177518: am 6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE 
* commit 'dd177518b5438bf12a0ee5e1c99970cd48eb025f':
  CDMALTE: Evaluate data network type in pollStateDone()
 2011-04-29 16:20:15 -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
Gloria Wang
92ed994b1c Merge "Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156." 2011-04-29 15:26:18 -07:00
Scott Main
7b29595bca am 75c78dc3: am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit '75c78dc364efb74c2d7c0187b3b26d0ab70e3c3e':
  docs: more documentation for ProgressBar
 2011-04-29 15:11:50 -07:00
Conley Owens
b36dad640c am c703b49e: am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()" 
* commit 'c703b49eb13993c45a1cab7ea1130601fba1df3e':
  Added null check on return value for getKeyDispatcherState()
 2011-04-29 15:11:48 -07:00
Conley Owens
a767c44489 am 7dcdfd79: am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here." 
* commit '7dcdfd7988d1e57c7a705a2d7294e8bfa2b8afc9':
  Eliminating dead logic - bitmap state simply cannot be null here.
 2011-04-29 15:11:45 -07:00
Conley Owens
22c5e26939 am 889bb20f: am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation." 
* commit '889bb20f1bb47437331d404a59b86e6dfa4e2e93':
  Removing unnecessary computation.
 2011-04-29 15:11:41 -07:00
Conley Owens
c0f3e83df1 am bb74af7b: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 
* commit 'bb74af7b13bdc72eaed19abc8c3300a6af0f1d9b':
 2011-04-29 15:11:38 -07:00
Conley Owens
1ad9b43ac7 am 27e8f1a3: am 8b22ef66: am e41d2aed: Merge "Using robust equality check." 
* commit '27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c':
  Using robust equality check.
 2011-04-29 15:11:34 -07:00
Conley Owens
3a770d11c7 am 014757ee: am a9517012: am 1e29552b: Merge "We don\'t need these local references." 
* commit '014757eea22fc9cceede1548c579c33c79464001':
  We don't need these local references.
 2011-04-29 15:11:30 -07:00
Conley Owens
dc48b1b103 am 49df110a: am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life." 
* commit '49df110aeb94ada810a8eec0540e30a25c267a56':
  Eliminating dead code with no other effect than consuming battery life.
 2011-04-29 15:11:26 -07:00
Conley Owens
b19bd46f33 am ded7c652: am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message" 
* commit 'ded7c652d754751e6fbde729d66825c69394d1cb':
  Remove duplicate '=' in exception message
 2011-04-29 15:11:22 -07:00