drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,924 Commits 1 Branch 0 Tags
Commit Graph

101924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
cf60cc9ade am 261f82ca: Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-dev 
* commit '261f82ca996a4b192b56350dd2eda6016f9d5203':
  Revert "Clean Paint.mBidiFlags as it is no longer used"
 2013-03-15 20:37:07 +00:00
Fabrice Di Meglio
2db91af6a6 am 2d93475c: Merge "Revert "Fix bug #8194572 Chrome SIGBUS\'es on launch around TextLayoutCacheKey"" into jb-mr2-dev 
* commit '2d93475c693dd2ac8555a19e0d8e7a689d3a22c3':
  Revert "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey"
 2013-03-15 20:37:05 +00:00
Fabrice Di Meglio
4249050126 am fe099074: Merge "Revert "fix argument mismatches in Paint JNI"" into jb-mr2-dev 
* commit 'fe099074c49b795c2ea8cf3ae9da8799bd0c6b09':
  Revert "fix argument mismatches in Paint JNI"
 2013-03-15 20:37:02 +00:00
Fabrice Di Meglio
261f82ca99 Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-dev 2013-03-15 20:34:06 +00:00
Fabrice Di Meglio
2d93475c69 Merge "Revert "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey"" into jb-mr2-dev 2013-03-15 20:33:49 +00:00
Fabrice Di Meglio
fe099074c4 Merge "Revert "fix argument mismatches in Paint JNI"" into jb-mr2-dev 2013-03-15 20:33:22 +00:00
Robert Greenwalt
8e338c9106 am 1b364498: Merge "Revert "Turn on more logging to find this bug."" into jb-mr2-dev 
* commit '1b36449830ef20473aac336f9b2585b6ad5987a5':
  Revert "Turn on more logging to find this bug."
 2013-03-15 19:24:01 +00:00
Nick Kralevich
2bc1b6e370 am fe57f62c: am 9c322c75: am f7ec4e61: Merge "Never call app_main more than once" 
* commit 'fe57f62cd854957cd64007ee23b0f70e6fcaea5b':
  Never call app_main more than once
 2013-03-15 19:23:58 +00:00
Robert Greenwalt
1b36449830 Merge "Revert "Turn on more logging to find this bug."" into jb-mr2-dev 2013-03-15 19:19:46 +00:00
Robert Greenwalt
15dd5be47e Revert "Turn on more logging to find this bug." 
This reverts commit bb5bcaaaed37e6215f5f253d968afcb10c1b2f3d
bug:8377625
Change-Id: I9663a4646f7581c86b2303aec2655cbf3742fd80
 2013-03-15 19:19:24 +00:00
Nick Kralevich
fe57f62cd8 am 9c322c75: am f7ec4e61: Merge "Never call app_main more than once" 
* commit '9c322c756276a9b22b05fd9c8bd67f2edfb50324':
  Never call app_main more than once
 2013-03-15 12:19:00 -07:00
Nick Kralevich
9c322c7562 am f7ec4e61: Merge "Never call app_main more than once" 
* commit 'f7ec4e61ebde9ff6d4934bd398e9ef8a39e4c28b':
  Never call app_main more than once
 2013-03-15 12:16:43 -07:00
Robert Greenwalt
bfbd638595 am 868adf73: Merge "Don\'t return an unmod collection." into jb-mr2-dev 
* commit '868adf7369ed9f0dcd02cee5dd36a50b892bf936':
  Don't return an unmod collection.
 2013-03-15 19:15:39 +00:00
Robert Greenwalt
868adf7369 Merge "Don't return an unmod collection." into jb-mr2-dev 2013-03-15 19:13:47 +00:00
Nick Kralevich
f7ec4e61eb Merge "Never call app_main more than once" 2013-03-15 19:08:50 +00:00
Craig Mautner
20a402e0dc am 8dfe99ce: Merge "Catch BadTokenException and continue." into jb-mr2-dev 
* commit '8dfe99ce20f2f7c08dd8d3cefcd18eb2d4fb10d8':
  Catch BadTokenException and continue.
 2013-03-15 19:02:11 +00:00
Craig Mautner
8dfe99ce20 Merge "Catch BadTokenException and continue." into jb-mr2-dev 2013-03-15 18:59:51 +00:00
Nick Kralevich
1fe21bd1b6 Never call app_main more than once 
Different kernels seem to handle ADDR_COMPAT_LAYOUT differently,
sometimes passing it to its children, sometimes not. If it's not
passed to its child successfully, we can end up in a restart loop.

Instead of testing for the presence of ADDR_COMPAT_LAYOUT, use an
environment variable instead, which is handled more predictably.

Bug: 8392487
Change-Id: Ia531dd2abb4e1cd46f3430d844e644f53581f530
 2013-03-15 11:59:03 -07:00
ztenghui
93a2fde962 am faf0e89c: Merge "Make release() behaves the same way as other part of media framework" into jb-mr2-dev 
* commit 'faf0e89ce3bdb2c50eb5da671bc4fc2a618ebf89':
  Make release() behaves the same way as other part of media framework
 2013-03-15 18:44:22 +00:00
ztenghui
faf0e89ce3 Merge "Make release() behaves the same way as other part of media framework" into jb-mr2-dev 2013-03-15 18:41:34 +00:00
Craig Mautner
e4bbb1cc45 Catch BadTokenException and continue. 
BadTokenException is a normal consequence of swapping IMEs while there
is a DO_SHOW_SOFT_INPUT message in the IIMethodWrapper queue. This
race condition cannot be avoided without an unacceptable lock down of
InputMethodManagerService.

Fixes bug 8387663.
Fixes bug 8263462.

Change-Id: I2c21573cf972145ab08e66604cdb9344139a3f31
 2013-03-15 11:38:44 -07:00
Robert Greenwalt
6629bcd660 Don't return an unmod collection. 
It's not needed as people can mess with this, and people do, so this fixes the build.
bug:8398355

Change-Id: Iddd00af41009c88b67fb7f9a8789bb416c377922
 2013-03-15 11:28:50 -07:00
Fabrice Di Meglio
da12f389eb Revert "Clean Paint.mBidiFlags as it is no longer used" 
This reverts commit 6d9fe5bd22b531bfce69b146254a4791c76acddc.
 2013-03-15 11:26:56 -07:00
Fabrice Di Meglio
19f46b0d7a Revert "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey" 
This reverts commit ebcacc785b0883c9435a3e850f790785fba93370.
 2013-03-15 11:26:23 -07:00
Fabrice Di Meglio
a4bf8114a7 Revert "fix argument mismatches in Paint JNI" 
This reverts commit b61fb10fe435b74a761e82f517abd0320f22193e.
 2013-03-15 11:22:29 -07:00
Lorenzo Colitti
c09d7cbf2b am c60967fd: Merge "Don\'t update routes if Dhcp fails." into jb-mr2-dev 
* commit 'c60967fd83e7a736f311a1887543df430a65164c':
  Don't update routes if Dhcp fails.
 2013-03-15 18:09:39 +00:00
Lorenzo Colitti
c60967fd83 Merge "Don't update routes if Dhcp fails." into jb-mr2-dev 2013-03-15 18:06:20 +00:00
Lorenzo Colitti
540f002c0b am b91e50c2: Fix build. 
* commit 'b91e50c266a7eb9dd6f8171deb497931ef7aef76':
  Fix build.
 2013-03-15 18:06:04 +00:00
Robert Greenwalt
28cdf1dc22 Don't update routes if Dhcp fails. 
bug:8377625
Change-Id: I11d2c29728078813bfb1245cc46e8cce2b307a2c
 2013-03-15 10:48:46 -07:00
Lorenzo Colitti
b91e50c266 Fix build. 
Change-Id: Iac84a5f35d7fcaebd096e605a4590f8c90fe97b0
 2013-03-16 02:42:30 +09:00
Lorenzo Colitti
aa0035464b am e78aa896: Merge "Set routes from stacked links as well." into jb-mr2-dev 
* commit 'e78aa8964766e5e2a9684de13176b08b7bd09e06':
  Set routes from stacked links as well.
 2013-03-15 17:17:38 +00:00
Lorenzo Colitti
e78aa89647 Merge "Set routes from stacked links as well." into jb-mr2-dev 2013-03-15 17:14:43 +00:00
Lorenzo Colitti
beb9dfaa1c am 827ef6e0: Merge "Add stacking to the NetworkStateTrackers." into jb-mr2-dev 
* commit '827ef6e0bd696b2cd0ff8d2bf28e4564b913c345':
  Add stacking to the NetworkStateTrackers.
 2013-03-15 17:14:10 +00:00
Lorenzo Colitti
3a2eb126ad am 8d0e2618: Merge "Add stacked interfaces to LinkProperties." into jb-mr2-dev 
* commit '8d0e261849af603e95b3da00c0d2e11be503ef62':
  Add stacked interfaces to LinkProperties.
 2013-03-15 17:14:07 +00:00
Lorenzo Colitti
827ef6e0bd Merge "Add stacking to the NetworkStateTrackers." into jb-mr2-dev 2013-03-15 17:11:30 +00:00
Lorenzo Colitti
8d0e261849 Merge "Add stacked interfaces to LinkProperties." into jb-mr2-dev 2013-03-15 17:09:00 +00:00
Chet Haase
c584f7f44e am b38258f3: Merge "Fix erroneous requestLayout-during-layout issues" into jb-mr2-dev 
* commit 'b38258f357a7857ce5d53caad0af9c38053ab071':
  Fix erroneous requestLayout-during-layout issues
 2013-03-15 14:31:55 +00:00
Chet Haase
b38258f357 Merge "Fix erroneous requestLayout-during-layout issues" into jb-mr2-dev 2013-03-15 14:29:41 +00:00
Lorenzo Colitti
f83d90c667 Set routes from stacked links as well. 
Currently, ConnectivityService adds and removes routes to/from
the routing table only based on the LinkProperties's routes.
Make it update routes based on the stacked links as well.

Bug: 8276725
Change-Id: I9a2adf537af5a04de0aaab3780afbcc3bb5c6acb
 2013-03-15 14:35:38 +09:00
Lorenzo Colitti
69edd64d9b Add stacking to the NetworkStateTrackers. 
Bug: 8276725
Change-Id: I55a107fea78f9cc84f15bd6c75292138fb35a1b6
 2013-03-15 14:35:35 +09:00
Lorenzo Colitti
419a4ce9e4 Add stacked interfaces to LinkProperties. 
Bug: 8276725
Change-Id: I2f592d4c690e9af0459ae742ab16107a10d89353
 2013-03-15 14:35:32 +09:00
Wink Saville
1165231342 am 33c5857c: Merge "Revert "Fail fast if somebody is adding default routes"" into jb-mr2-dev 
* commit '33c5857c54a67de62917beae6c2dfd8b5ca3dce8':
  Revert "Fail fast if somebody is adding default routes"
 2013-03-15 05:10:08 +00:00
Wink Saville
33c5857c54 Merge "Revert "Fail fast if somebody is adding default routes"" into jb-mr2-dev 2013-03-15 05:07:41 +00:00
Wink Saville
7b5fd05d4e Revert "Fail fast if somebody is adding default routes" 
This reverts commit 6f210bd0191e1936bbc1f036912c6efc4ea69475

Mako wouldn't boot for me, reverting for now.

Change-Id: Ie92d6bf77811e7257e86d65e1e15e1973c027cd7
 2013-03-15 05:07:04 +00:00
Yu Shan Emily Lau
4f394b006b am d6bbe3b2: Merge "Media test clean up. Remove duplicated camera preview stress test. Remove duplicated recorder stress test. Remove camera recorder switching stress test. Reduced the total number of iterations for all the stress loop." into jb-mr2-dev 
* commit 'd6bbe3b2ed82ac78415a06596b807b33f0cbe66d':
  Media test clean up. Remove duplicated camera preview stress test. Remove duplicated recorder stress test. Remove camera recorder switching stress test. Reduced the total number of iterations for all the stress loop.
 2013-03-15 01:28:43 +00:00
Yu Shan Emily Lau
d6bbe3b2ed Merge "Media test clean up. Remove duplicated camera preview stress test. Remove duplicated recorder stress test. Remove camera recorder switching stress test. Reduced the total number of iterations for all the stress loop." into jb-mr2-dev 2013-03-15 01:27:02 +00:00
Yu Shan Emily Lau
984505d816 Media test clean up. 
Remove duplicated camera preview stress test.
Remove duplicated recorder stress test.
Remove camera recorder switching stress test.
Reduced the total number of iterations for all the stress loop.

Change-Id: I447f8060fadd0599c160727fb7dda8a4cc384656
 2013-03-14 18:14:54 -07:00
Nick Kralevich
754c47164f am fd31ee49: am 6098579a: am 1ae6ae20: Merge "Don\'t use ADDR_COMPAT_LAYOUT on the emulator" 
* commit 'fd31ee4996b67be51f5f4c94d8ee2d55695a01bc':
  Don't use ADDR_COMPAT_LAYOUT on the emulator
 2013-03-15 00:24:17 +00:00
Nick Kralevich
fd31ee4996 am 6098579a: am 1ae6ae20: Merge "Don\'t use ADDR_COMPAT_LAYOUT on the emulator" 
* commit '6098579a205848339cf6886f5c6d476ccf40e6fe':
  Don't use ADDR_COMPAT_LAYOUT on the emulator
 2013-03-14 17:21:38 -07:00
Nick Kralevich
6098579a20 am 1ae6ae20: Merge "Don\'t use ADDR_COMPAT_LAYOUT on the emulator" 
* commit '1ae6ae2094fd0ab8c82ad1a347e7a8bd67d995e5':
  Don't use ADDR_COMPAT_LAYOUT on the emulator
 2013-03-14 17:20:12 -07:00