ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,942 Commits 2 Branches 0 Tags 54 MiB
4672704eaa
Commit Graph

13942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Egnor
4672704eaa am 70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo 
Merge commit '70c294b205f7b27308c45bf893270bef6081d39b' into froyo-plus-aosp

* commit '70c294b205f7b27308c45bf893270bef6081d39b':
  Fix OperationScheduler moratorium calculation for clock rollback case.
 2010-04-08 22:39:27 -07:00
Xavier Ducrohet
be819eed47 am bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo 
Merge commit 'bbc6e33b1f7fff3280c3fa44836833f4bab4bf99' into froyo-plus-aosp

* commit 'bbc6e33b1f7fff3280c3fa44836833f4bab4bf99':
  Adds back the finalize method on the replaced Paint class.
 2010-04-08 22:39:24 -07:00
Jeff Brown
16c8a3671d am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 
Merge commit '37d2f5d15b850830d65b1f68ebc95d5ba0612a46' into froyo-plus-aosp

* commit '37d2f5d15b850830d65b1f68ebc95d5ba0612a46':
  Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
 2010-04-08 22:39:19 -07:00
Dan Egnor
35c1a2dc1f Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo 2010-04-08 17:38:28 -07:00
Dan Egnor
66424a44c5 Fix OperationScheduler moratorium calculation for clock rollback case. 
Make the unit test exercise some clock-rollback scenarios, using
a properly injected artificial clock.

Bug: 2579585
Change-Id: I6f81c32318ba27429bd30ff53b48449218e4ac64
 2010-04-08 17:30:37 -07:00
Xavier Ducrohet
a540ed0064 Merge "Adds back the finalize method on the replaced Paint class." into froyo 2010-04-08 17:29:39 -07:00
Jeff Brown
7710cd4c35 Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 2010-04-08 17:18:15 -07:00
Irfan Sheriff
aeae766c4c am c9b6851a: Throttling framework addins 
Merge commit 'c9b6851af68bdc20c4903b16c344e9f116647219' into froyo-plus-aosp

* commit 'c9b6851af68bdc20c4903b16c344e9f116647219':
  Throttling framework addins
 2010-04-08 17:01:59 -07:00
Jeff Brown
5733ad453d am 267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo 
Merge commit '267f0a6b683a2de75450afee59d2058b292c72c8' into froyo-plus-aosp

* commit '267f0a6b683a2de75450afee59d2058b292c72c8':
  Workaround NPE caused by packages missing signatures.
 2010-04-08 16:44:40 -07:00
Jeff Brown
68e2f85740 am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo 
Merge commit '779a4ca84d62a6e4f18a723cfc18c5d035f60fed' into froyo-plus-aosp

* commit '779a4ca84d62a6e4f18a723cfc18c5d035f60fed':
  Improve robustness of package manager certificate collection.
 2010-04-08 16:44:37 -07:00
Jeff Brown
62737b55d2 Merge "Workaround NPE caused by packages missing signatures." into froyo 2010-04-08 16:41:47 -07:00
Jeff Brown
20460cfc7d Merge "Improve robustness of package manager certificate collection." into froyo 2010-04-08 16:41:37 -07:00
Brett Chabot
5313fd997b am 185f1a96: Merge "IME test fixes." into froyo 
Merge commit '185f1a96683f59e2ff617b688449fd490e364be7' into froyo-plus-aosp

* commit '185f1a96683f59e2ff617b688449fd490e364be7':
  IME test fixes.
 2010-04-08 16:39:50 -07:00
Brett Chabot
399d2f06da Merge "IME test fixes." into froyo 2010-04-08 16:36:02 -07:00
Robert Greenwalt
8a3b2cf4c8 am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo 
Merge commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7' into froyo-plus-aosp

* commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7':
  Updating some notificiation UI for Throttling
 2010-04-08 16:18:31 -07:00
Robert Greenwalt
8e1b0077ad Merge "Updating some notificiation UI for Throttling" into froyo 2010-04-08 16:09:31 -07:00
Dan Egnor
02b338b7f2 am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo 
Merge commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b' into froyo-plus-aosp

* commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b':
  Change TrafficStats to a new JNI implementation.
 2010-04-08 14:48:50 -07:00
Dan Egnor
efdccf3ebb Merge "Change TrafficStats to a new JNI implementation." into froyo 2010-04-08 14:45:07 -07:00
Dan Egnor
7f22a7ccd1 am 21248080: Merge "Missed these ones in the previous rename." into froyo 
Merge commit '2124808060a1eb5ea396238b7b99d2ed266b0b53' into froyo-plus-aosp

* commit '2124808060a1eb5ea396238b7b99d2ed266b0b53':
  Missed these ones in the previous rename.
 2010-04-08 14:15:29 -07:00
Dan Egnor
2728e5f544 Merge "Missed these ones in the previous rename." into froyo 2010-04-08 14:10:50 -07:00
Grace Kloba
f11f1e8c89 am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling, frame rate can drop by 30%. 
Merge commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6' into froyo-plus-aosp

* commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6':
  For performance reason, we choose to block the picture
 2010-04-08 14:08:35 -07:00
Grace Kloba
b2a21d6ac3 Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don't block the live update during drag/fling, frame rate can drop by 30%." into froyo 2010-04-08 14:05:05 -07:00
Brad Fitzpatrick
ab7954a0b0 am c62cdef4: Merge "Rename logtag for clarity." into froyo 
Merge commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72' into froyo-plus-aosp

* commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72':
  Rename logtag for clarity.
 2010-04-08 14:04:43 -07:00
Brad Fitzpatrick
b56b5fd4fc Merge "Rename logtag for clarity." into froyo 2010-04-08 14:01:23 -07:00
Jeff Brown
bd2c3a73d0 am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE 
Merge commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f' into froyo-plus-aosp

* commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f':
  @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
 2010-04-08 13:49:55 -07:00
Andreas Huber
376f0c3ee6 am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo 
Merge commit 'eb12e45f7a92fd424988451256c82605d086245d' into froyo-plus-aosp

* commit 'eb12e45f7a92fd424988451256c82605d086245d':
  Refactor connection/redirection code, support redirects on reconnection.
 2010-04-08 12:45:59 -07:00
Robert Greenwalt
53b96a3c8e am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo 
Merge commit '2b4b5738011f5ccb118ad15721fd757c85448966' into froyo-plus-aosp

* commit '2b4b5738011f5ccb118ad15721fd757c85448966':
  Add service to monitor/control the flow of data.
 2010-04-08 12:45:51 -07:00
Andreas Huber
d85bfb3a14 Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo 2010-04-08 12:44:33 -07:00
Robert Greenwalt
98b863760c Merge "Add service to monitor/control the flow of data." into froyo 2010-04-08 12:42:09 -07:00
Dianne Hackborn
6286f57ea6 am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 
Merge commit '2670105ee6929d3036a1a7134400730f214f0f7e' into froyo-plus-aosp

* commit '2670105ee6929d3036a1a7134400730f214f0f7e':
  Fix issue #2580316: Contacts and Phone app not supporting landscape mode...
 2010-04-08 11:39:03 -07:00
The Android Open Source Project
d1f9f3e832 merge from open-source master 
Change-Id: I0902959c7703bd3a1c41abfc6a8788b89d0aa977
 2010-04-08 11:35:37 -07:00
Dianne Hackborn
be4143d514 Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 2010-04-08 11:35:27 -07:00
The Android Open Source Project
529973acc2 merge from open-source master 
Change-Id: I975030d9572463bc69245bcffa25c47d7acb2b51
 2010-04-08 11:27:55 -07:00
Scott Main
c01e716961 am 4981863d: Merge "docs: revisions to the installLocation documentation" into froyo 
Merge commit '4981863de52941f053bf002ae2f9c8f705534599' into froyo-plus-aosp

* commit '4981863de52941f053bf002ae2f9c8f705534599':
  docs: revisions to the installLocation documentation
 2010-04-08 11:25:36 -07:00
Scott Main
436aa0ff9c Merge "docs: revisions to the installLocation documentation" into froyo 2010-04-08 11:22:42 -07:00
Jaikumar Ganesh
8d2ccb8b2d am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo 
Merge commit 'd1a95f975b03371a937da87735359c286a6de7f3' into froyo-plus-aosp

* commit 'd1a95f975b03371a937da87735359c286a6de7f3':
  Don't allow connection to profiles in TURNING_OFF state.
 2010-04-08 10:08:25 -07:00
Jaikumar Ganesh
6b4e57141f Merge "Don't allow connection to profiles in TURNING_OFF state." into froyo 2010-04-08 10:01:50 -07:00
Andrei Popescu
d18e7e3d54 am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo 
Merge commit '3fe36fe589809b732db12054428166adb069f53b' into froyo-plus-aosp

* commit '3fe36fe589809b732db12054428166adb069f53b':
  Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
 2010-04-08 09:10:09 -07:00
Andrei Popescu
95ecb699b0 Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo 2010-04-08 09:07:32 -07:00
Andreas Huber
4a42aa9d7c am c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error hand 
Merge commit 'c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a' into froyo-plus-aosp

* commit 'c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a':
  Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
 2010-04-08 08:31:20 -07:00
Andreas Huber
fd1a82638c Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection." into froyo 2010-04-08 08:27:20 -07:00
Daniel Sandler
089057817f am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo 
Merge commit '8d318958a3eb3abac3696c436e27e51e0bc2c6f8' into froyo-plus-aosp

* commit '8d318958a3eb3abac3696c436e27e51e0bc2c6f8':
  Transparent alarm icons for lockscreen.
 2010-04-08 06:10:12 -07:00
Daniel Sandler
221ff33f3a am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo 
Merge commit '9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7' into froyo-plus-aosp

* commit '9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7':
  Add emergency call button to PUK'd lockscreen.
 2010-04-08 06:10:09 -07:00
Daniel Sandler
c75afb3e8a Merge "Transparent alarm icons for lockscreen." into froyo 2010-04-08 06:07:57 -07:00
Daniel Sandler
81ce80eb67 Merge "Add emergency call button to PUK'd lockscreen." into froyo 2010-04-08 06:06:50 -07:00
Dianne Hackborn
356f09beba am ecb0e637: Fix issue #2541849: System crash when an app with active notifications... 
Merge commit 'ecb0e637870553f9c12dc6b9178de0512563af9c' into froyo-plus-aosp

* commit 'ecb0e637870553f9c12dc6b9178de0512563af9c':
  Fix issue #2541849: System crash when an app with active notifications...
 2010-04-07 22:39:18 -07:00
Wu-cheng Li
ba00ad094e am 3f4639a6: Update API and javadoc according to API review. 
Merge commit '3f4639a6611222ae1ae5493de49213250d292139' into froyo-plus-aosp

* commit '3f4639a6611222ae1ae5493de49213250d292139':
  Update API and javadoc according to API review.
 2010-04-07 21:58:21 -07:00
Suchi Amalapurapu
33409ed31f am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo 
Merge commit 'c2461be6279137f872becf695befeb7ba8770a64' into froyo-plus-aosp

* commit 'c2461be6279137f872becf695befeb7ba8770a64':
  Fix 2579461
 2010-04-07 21:29:05 -07:00
Suchi Amalapurapu
de14d8f178 Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo 2010-04-07 21:24:36 -07:00
Dianne Hackborn
cad1d540bc am ce59fb8b: Fix issue #2578244: playing audio file downloaded by the browser... 
Merge commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d' into froyo-plus-aosp

* commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d':
  Fix issue #2578244: playing audio file downloaded by the browser...
 2010-04-07 19:07:54 -07:00