Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,761 Commits 3 Branches 0 Tags
1554ecce32e9fdbcc4b9ccf3bc1ce194fe2aecce
Commit Graph

21761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Egnor
1554ecce32 am 5b4cc93b: am f5d506d9: am 78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents(). 2010-04-08 23:12:43 -07:00
Dan Egnor
5b4cc93b0d am f5d506d9: am 78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents(). 
Merge commit 'f5d506d92958d43449cb9ef77e6c9b6087e1cd68' into kraken

* commit 'f5d506d92958d43449cb9ef77e6c9b6087e1cd68':
  Hail-Mary attempt to avoid apparent blocking problems in readEvents().
 2010-04-08 23:08:56 -07:00
Dan Egnor
f5d506d929 am 78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents(). 
Merge commit '78158db51029e7dbe160e60af0deb7594bec051d' into froyo-plus-aosp

* commit '78158db51029e7dbe160e60af0deb7594bec051d':
  Hail-Mary attempt to avoid apparent blocking problems in readEvents().
 2010-04-08 23:04:16 -07:00
Dan Egnor
78158db510 Hail-Mary attempt to avoid apparent blocking problems in readEvents(). 
Use the same procedure (select() with a short timeout) used by "logcat -d",
which doesn't seem to have any blocking problems.

Bug: 2569403
Change-Id: Ia27bb4207919a1288716b41a007b4b4b52f8e90a
 2010-04-08 22:59:43 -07:00
Dan Egnor
f139940a91 am d069fc9a: am a2bf7343: am 70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo 2010-04-08 22:54:34 -07:00
Xavier Ducrohet
3aa8710c4f am f31e4abd: am 3895007d: am bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo 2010-04-08 22:54:29 -07:00
Jeff Brown
52a28b2534 am 6883c176: am 6c099149: am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 2010-04-08 22:54:25 -07:00
Dan Egnor
d069fc9ad7 am a2bf7343: am 70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo 
Merge commit 'a2bf73435ba776de1a55847276fc54c00648971b' into kraken

* commit 'a2bf73435ba776de1a55847276fc54c00648971b':
  Fix OperationScheduler moratorium calculation for clock rollback case.
 2010-04-08 22:50:50 -07:00
Xavier Ducrohet
f31e4abd5e am 3895007d: am bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo 
Merge commit '3895007d523a9d5c92b971908f898f19a8c9f8ff' into kraken

* commit '3895007d523a9d5c92b971908f898f19a8c9f8ff':
  Adds back the finalize method on the replaced Paint class.
 2010-04-08 22:50:46 -07:00
Jeff Brown
6883c1769f am 6c099149: am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 
Merge commit '6c099149daff56ca04ab40a86950e7b61caf6505' into kraken

* commit '6c099149daff56ca04ab40a86950e7b61caf6505':
  Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
 2010-04-08 22:50:42 -07:00
Dan Egnor
a2bf73435b 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
3895007d52 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
6c099149da 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
Mathias Agopian
88235a5e9b am 672ea584: Merge "fix [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken 2010-04-08 22:38:29 -07:00
Mathias Agopian
672ea584f5 Merge "fix [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken 2010-04-08 19:10:52 -07:00
Mathias Agopian
db3647ff4f fix [2420565] Surface.lockCanvas() updates the dirty region too often 
There was a bug where we were we could be reallocating buffers for no reason.

Change-Id: Ieb8a81a289da9339ab7faf987cd3a73428943c1a
 2010-04-08 19:09:04 -07:00
Dan Egnor
70c294b205 Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo 2010-04-08 17:38:28 -07:00
Dan Egnor
d64567450f 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
bbc6e33b1f Merge "Adds back the finalize method on the replaced Paint class." into froyo 2010-04-08 17:29:39 -07:00
Xavier Ducrohet
c56653bff1 Adds back the finalize method on the replaced Paint class. 
without it com.android.layoutlib.bridge.TestClassReplacement fails.

Change-Id: Iafb6548f45c31e901591a45239224895c4403be8
 2010-04-08 17:18:35 -07:00
Jeff Brown
37d2f5d15b Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 2010-04-08 17:18:15 -07:00
Irfan Sheriff
eaec9f2e67 am d99540d7: am 750f3211: am c9b6851a: Throttling framework addins 2010-04-08 17:10:36 -07:00
Irfan Sheriff
d99540d7a2 am 750f3211: am c9b6851a: Throttling framework addins 
Merge commit '750f32117b96a8af4fb03fae459a80f79a667fca' into kraken

* commit '750f32117b96a8af4fb03fae459a80f79a667fca':
  Throttling framework addins
 2010-04-08 17:05:06 -07:00
Irfan Sheriff
750f32117b 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
Irfan Sheriff
c9b6851af6 Throttling framework addins 
Add ThrottleManager in getSystemService
Add API for URL fetch

Bug: 2576057
Change-Id: Icd25c8b91ea4beea15c74e8ad7292ab48c962253
 2010-04-08 16:53:32 -07:00
Jeff Brown
64010e8350 Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission. 
Change-Id: I4be691f20f650b412beb22b199a4cbef879b2668
 2010-04-08 16:52:18 -07:00
Jeff Brown
5a8a507c5a am b059dc9c: am b00771aa: am 267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo 2010-04-08 16:49:56 -07:00
Jeff Brown
51fb09d948 am cebd1e94: am 6742a0c9: am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo 2010-04-08 16:49:52 -07:00
Brett Chabot
19912d2f3b am 3622d253: am 133d0b70: am 185f1a96: Merge "IME test fixes." into froyo 2010-04-08 16:49:46 -07:00
Jeff Brown
b059dc9c89 am b00771aa: am 267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo 
Merge commit 'b00771aa806e9fd43669f09e8c348f2b4457ca0b' into kraken

* commit 'b00771aa806e9fd43669f09e8c348f2b4457ca0b':
  Workaround NPE caused by packages missing signatures.
 2010-04-08 16:47:19 -07:00
Jeff Brown
cebd1e9468 am 6742a0c9: am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo 
Merge commit '6742a0c9ccb8ade97d9cdfd53f7c74a9dc04c3a0' into kraken

* commit '6742a0c9ccb8ade97d9cdfd53f7c74a9dc04c3a0':
  Improve robustness of package manager certificate collection.
 2010-04-08 16:47:15 -07:00
Brett Chabot
3622d25347 am 133d0b70: am 185f1a96: Merge "IME test fixes." into froyo 
Merge commit '133d0b70ff569dad9d996be49fdea10c2bdd4b97' into kraken

* commit '133d0b70ff569dad9d996be49fdea10c2bdd4b97':
  IME test fixes.
 2010-04-08 16:45:16 -07:00
Jeff Brown
b00771aa80 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
6742a0c9cc 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
267f0a6b68 Merge "Workaround NPE caused by packages missing signatures." into froyo 2010-04-08 16:41:47 -07:00
Jeff Brown
779a4ca84d Merge "Improve robustness of package manager certificate collection." into froyo 2010-04-08 16:41:37 -07:00
Brett Chabot
133d0b70ff 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
185f1a9668 Merge "IME test fixes." into froyo 2010-04-08 16:36:02 -07:00
Robert Greenwalt
b221637559 am da0498c5: am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo 2010-04-08 16:28:08 -07:00
Robert Greenwalt
da0498c598 am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo 
Merge commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75' into kraken

* commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75':
  Updating some notificiation UI for Throttling
 2010-04-08 16:25:54 -07:00
Robert Greenwalt
6cf3d4aa76 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
cc691f5061 Merge "Updating some notificiation UI for Throttling" into froyo 2010-04-08 16:09:31 -07:00
Robert Greenwalt
c87dc6dc90 Updating some notificiation UI for Throttling 
String update and make one an ongoing notification.

bug:2576057
Change-Id: I7980f110c7eed8e8bf305490eddaa58e2949e3be
 2010-04-08 16:00:26 -07:00
Dan Egnor
9a907e75bc am a40b3a8d: am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo 2010-04-08 14:57:02 -07:00
Brett Chabot
1d679147d5 IME test fixes. 
Tweak OneEditTextActivitySelectedTests:testSoftKeyboardAutoPop so it always
expects IME to be shown for devices with no hard keyboard.

Bug 2267311 2318969

Change-Id: Ica31e8f1153cf3e7dbc838d263ea0ae805161610
 2010-04-08 14:55:24 -07:00
Dan Egnor
a40b3a8d98 am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo 
Merge commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b' into kraken

* commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b':
  Change TrafficStats to a new JNI implementation.
 2010-04-08 14:53:06 -07:00
Dan Egnor
c1420832a8 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
5945579e4e Merge "Change TrafficStats to a new JNI implementation." into froyo 2010-04-08 14:45:07 -07:00
Dan Egnor
c138fd3a77 am a28a05f3: am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo 2010-04-08 14:24:15 -07:00
Dan Egnor
a28a05f31b am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo 
Merge commit 'f1f00f5bddd6b222879166f4528055a30bed307e' into kraken

* commit 'f1f00f5bddd6b222879166f4528055a30bed307e':
  Missed these ones in the previous rename.
 2010-04-08 14:19:52 -07:00