Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,762 Commits 3 Branches 0 Tags
0ad9356bdc2d6901a477a0faccbb809dab12193b
Commit Graph

26948 Commits

Author SHA1 Message Date
Amith Yamasani
0ad9356bdc am 283d1409: am f624d72c: am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev 
* commit '283d1409ddadd35cd41b5496659d3a24dc365fb0':
  Fix crashes when quickly adding and removing users
 2012-10-21 07:53:56 -07:00
Amith Yamasani
283d1409dd am f624d72c: am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev 
* commit 'f624d72cb0fe40fd5748d4f0d1a93bf267aa3ed8':
  Fix crashes when quickly adding and removing users
 2012-10-21 07:50:55 -07:00
Amith Yamasani
f624d72cb0 am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev 
* commit '8074e98b20ac04fdc032a1ed00dd6763b7e04147':
  Fix crashes when quickly adding and removing users
 2012-10-21 07:48:02 -07:00
Amith Yamasani
8074e98b20 Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev 2012-10-21 07:44:46 -07:00
Fabrice Di Meglio
3c371b28ef am 0be6a28e: am 08f27b1b: am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev 
* commit '0be6a28ed5f27217d66c69195524d8747a6975bc':
  Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
 2012-10-19 19:22:05 -07:00
Fabrice Di Meglio
0be6a28ed5 am 08f27b1b: am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev 
* commit '08f27b1bffbf01d9e5a102b8c90a3c2095fc82b3':
  Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
 2012-10-19 19:19:00 -07:00
Fabrice Di Meglio
08f27b1bff am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev 
* commit '59420ecd1518289cc47c32181250539c981f85f0':
  Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
 2012-10-19 19:17:06 -07:00
Fabrice Di Meglio
59420ecd15 Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev 2012-10-19 19:14:30 -07:00
Fabrice Di Meglio
d3156a2a56 Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO 
This was a regression introduced by a previous CL.

- we actually need to let the layout params resolution goes all the time
as we dont have any "isResolved" state and a public API for doing its reset thru ViewGroup.

The current implementation is simple and works even if it is doing sometimes a bit more
than it should really do. This is a well conscious tradeoff.

Change-Id: I5c4d532331b3970dfe88f016bc305cbc4a0d83f1
 2012-10-19 18:46:43 -07:00
Amith Yamasani
db6a14cc85 Fix crashes when quickly adding and removing users 
Make USER_REMOVED an ordered broadcast and send it before the user's
state is completely removed from the system. This gives services the
opportunity to clean up their state, while still having access to the
user's directory and UserInfo object (such as serial number).

Tell SyncManager to skip over dying/partially created users.

Improve UserManager tests, waiting for users to be removed fully.

Bug: 7382252

Change-Id: I93cfb39c9efe6f15087bf83c569a2d154ef27168
 2012-10-19 16:23:30 -07:00
Christopher Tate
58fc8e5ada am 9fffd565: am e9472f29: am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev 
* commit '9fffd565a927f03d10c2009b741e7222ddd4967e':
  Document immutable requirement of SharedPreferences return objects
 2012-10-19 14:46:48 -07:00
Christopher Tate
9fffd565a9 am e9472f29: am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev 
* commit 'e9472f2937478ead4a5c2115ee69e508e4933417':
  Document immutable requirement of SharedPreferences return objects
 2012-10-19 14:43:50 -07:00
Christopher Tate
e9472f2937 am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev 
* commit '935415a050be75f582f632dd168be9fbb047137b':
  Document immutable requirement of SharedPreferences return objects
 2012-10-19 14:41:16 -07:00
Christopher Tate
935415a050 Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev 2012-10-19 14:38:05 -07:00
Christopher Tate
01ed79c578 Document immutable requirement of SharedPreferences return objects 
In particular, make it quite clear that the set returned by
getStringSet() must not be modfied by the app, period; and
add a similar caution about the map returned via getAll().

Also, fix a bug that could lead to unexpected data being committed
if the set instance passed to putStringSet() was mutated by the
app after that call (including mutations after commit() was
invoked).

Bug 7312641

Change-Id: If9a1be1b0669ac879ff7a7dc67a8805548ea10cc
 2012-10-19 13:43:52 -07:00
Alon Albert
7b78f5001a Merge "Add sync reason to dumpsys" 2012-10-19 13:43:16 -07:00
Fabrice Di Meglio
da391700c9 resolved conflicts for merge of e549a602 to master 
Change-Id: I37dc0e48321d4baea49d77b6ef22bca19dcb0d9b
 2012-10-19 12:49:30 -07:00
Alon Albert
57286f9706 Add sync reason to dumpsys 
Also:
 * add a second history section that logs
 * log mesg as text instead of number
 * dump Sync Status as a table

 Sample log:
Recent Sync History
  #1  : 2012-10-11 15:06:11     USER    0.4s            aagmtest1@gmail.com/com.google u0  com.android.calendar                                  com.google.android.calendar
  #2  : 2012-10-11 15:06:11     USER    0.1s            aagmtest1@gmail.com/com.google u0  subscribedfeeds                                       android.uid.system:1000
    mesg=parse-error
  #3  : 2012-10-11 15:06:11     USER    0.0s            aagmtest1@gmail.com/com.google u0  com.google.android.apps.uploader.PicasaUploadProvider android.uid.system:1000
  #4  : 2012-10-11 15:06:10     USER    0.1s            aagmtest1@gmail.com/com.google u0  com.google.android.gms.plus.action                    android.uid.system:1000

Recent Sync History Extras
  #1  : 2012-10-11 15:06:11     USER   aagmtest1@gmail.com/com.google u0  com.android.calendar                                  Bundle[{feed=aagmtest1@gmail.com, force=true, ignore_settings=true, ignore_backoff=true}]
  #2  : 2012-10-11 15:06:11     USER   aagmtest1@gmail.com/com.google u0  subscribedfeeds                                       Bundle[{ignore_backoff=true, force=true, ignore_settings=true}]
  #3  : 2012-10-11 15:06:11     USER   aagmtest1@gmail.com/com.google u0  com.google.android.apps.uploader.PicasaUploadProvider Bundle[{ignore_backoff=true, force=true, ignore_settings=true}]
  #4  : 2012-10-11 15:06:10     USER   aagmtest1@gmail.com/com.google u0  com.google.android.gms.plus.action                    Bundle[{ignore_backoff=true, force=true, ignore_settings=true}]

Sync Status
Account aagmtest1@gmail.com u0 com.google
=======================================================================
Authority                                           Syncable  Enabled  Delay  Loc  Poll  Per  Serv  User  Tot  Time  Last Sync            Periodic
-------------------------------------------------------------------------------------------------------------------------------------------------------------
com.google.android.apps.currents                    1         true            0    2     1    2     1     6    0:35  PERIODIC SUCCESS     86400
                                                                                                                     2012-10-12 14:59:40  2012-10-13 14:58:13
com.google.android.music.MusicContent               1         true            0    0     1    2     1     4    0:09  PERIODIC SUCCESS     86400
                                                                                                                     2012-10-12 14:59:18  2012-10-13 14:58:13
com.google.android.gms.plus.action                  1         true            0    0     1    1     1     3    0:00  PERIODIC SUCCESS     86400
                                                                                                                     2012-10-12 14:59:15  2012-10-13 14:58:13
com.google.android.apps.magazines                   1         true            0    1     1    2     1     5    0:14  PERIODIC SUCCESS     86400
                                                                                                                     2012-10-12 14:59:00  2012-10-13 14:58:13

Change-Id: Iffeb825e4b4f6217940a39b0dd71e06856f08f3f
 2012-10-19 12:39:27 -07:00
Fabrice Di Meglio
e549a602a3 am af26ac31: am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev 
* commit 'af26ac3130c0e956e28443d6e42212b02d4da611':
  Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
 2012-10-19 11:38:18 -07:00
Fabrice Di Meglio
af26ac3130 am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev 
* commit '398a6713c355cf59af071e944268aec7c0096b5a':
  Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
 2012-10-19 11:36:12 -07:00
Fabrice Di Meglio
398a6713c3 Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev 2012-10-19 11:33:01 -07:00
John Spurlock
370e82eb20 am 01d2c64a: am 7404f28b: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev 
* commit '01d2c64ab29c665a2799b1319dd6c35c5b921eec':
  Frameworks base: Promote dream setting defaults to config.
 2012-10-19 11:07:12 -07:00
John Spurlock
01d2c64ab2 am 7404f28b: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev 
* commit '7404f28b11e386a42b67ec8afcc9823f2bd03c2b':
  Frameworks base: Promote dream setting defaults to config.
 2012-10-19 11:05:23 -07:00
John Spurlock
7404f28b11 am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev 
* commit '8c82025650fdbcb2a80be03f8be6dbff430b678c':
  Frameworks base: Promote dream setting defaults to config.
 2012-10-19 11:02:40 -07:00
John Spurlock
8c82025650 Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev 2012-10-19 11:00:00 -07:00
Romain Guy
41974cdf7b am be432fa0: am eb78cf53: am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev 
* commit 'be432fa01cc5995bcab162369c47454903a5ae55':
  Defer layer rendering to avoid stalls Bug #7326824
 2012-10-19 10:47:32 -07:00
Romain Guy
be432fa01c am eb78cf53: am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev 
* commit 'eb78cf538f87301c1612bf081ae2d5f93cae50f0':
  Defer layer rendering to avoid stalls Bug #7326824
 2012-10-19 10:45:41 -07:00
Romain Guy
eb78cf538f am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev 
* commit '8b946c055ddd90cf79cd407c9f68a013d5d24c2a':
  Defer layer rendering to avoid stalls Bug #7326824
 2012-10-19 10:43:04 -07:00
Romain Guy
8b946c055d Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev 2012-10-19 10:40:28 -07:00
Craig Mautner
d8a9073a31 am 59a9cc18: am 444354d2: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev 
* commit '59a9cc18f30d2ba2aec952bcf3a65b1774986a40':
  Allow getDisplayContentLocked to return null...
 2012-10-19 09:34:35 -07:00
Craig Mautner
59a9cc18f3 am 444354d2: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev 
* commit '444354d2c62de37b65782f15c864af21086b4b04':
  Allow getDisplayContentLocked to return null...
 2012-10-19 09:32:19 -07:00
Craig Mautner
444354d2c6 am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev 
* commit '0ed07a0a30ef71053d0426956d3c198bb7540d4e':
  Allow getDisplayContentLocked to return null...
 2012-10-19 09:30:06 -07:00
Craig Mautner
0ed07a0a30 Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev 2012-10-19 09:27:06 -07:00
John Spurlock
ed108f3d12 Frameworks base: Promote dream setting defaults to config. 
So that:
 - the values can be shared (to fix assoc bug)
 - the values can be customized in product overlays

Bug:7373284
Change-Id: I37f037082523a3d975f6014f36afa28c60117372
 2012-10-19 11:32:03 -04:00
Dave Burke
0b9b415632 am b1f434c1: am 744b4dca: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev 
* commit 'b1f434c16eefb028ef441ba40df8abe1e087a4eb':
  Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
 2012-10-18 21:09:48 -07:00
Dave Burke
b1f434c16e am 744b4dca: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev 
* commit '744b4dca34e605b80e553a34327067abc862a320':
  Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
 2012-10-18 21:07:52 -07:00
Dave Burke
744b4dca34 am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev 
* commit '09a5321c60c02d944684abb98e0daec9dd810fab':
  Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
 2012-10-18 21:05:29 -07:00
Dave Burke
09a5321c60 Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev 2012-10-18 21:02:13 -07:00
Dave Burke
579e14016c Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" 
This reverts commit 57fca90ac6

Change-Id: I21b007a7d150a4c23f25a706cdba5cb86198198f
 2012-10-18 20:41:55 -07:00
Fabrice Di Meglio
b003e28c1d Fix bug #7367429 Popup window should get its direction from it Anchor View if it can 
- set the popup layout direction depending on the anchor view's layout direction
(if not defined before)
- make first pass of ViewRootImpl.performTraversals() and configuration update
not override any layout direction that could have been set before

Change-Id: I8e86ca805f0caf52c058d06aa7861df56fb862e6
 2012-10-18 18:02:56 -07:00
Fabrice Di Meglio
c38684af87 am 4c2db5f2: am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev 
* commit '4c2db5f2a579132f6b6861c50d7ff99bb6c8035c':
  Fix missing @hide on ViewGroup.resolveLayoutParams()
 2012-10-18 16:29:00 -07:00
Fabrice Di Meglio
4c2db5f2a5 am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev 
* commit '8de328c996a9f3a8f5ca3ea8e7c47421dd09b9aa':
  Fix missing @hide on ViewGroup.resolveLayoutParams()
 2012-10-18 16:27:09 -07:00
Fabrice Di Meglio
8de328c996 am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev 
* commit '45c77ca0f6afd568ff6d149e17fb43c684e51722':
  Fix missing @hide on ViewGroup.resolveLayoutParams()
 2012-10-18 16:24:08 -07:00
Fabrice Di Meglio
45c77ca0f6 Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev 2012-10-18 16:20:36 -07:00
Fabrice Di Meglio
1e0ed6b232 Fix missing @hide on ViewGroup.resolveLayoutParams() 
- as we dont need this to be public

Change-Id: Ib8de262eec26d4785b13875d59599369b06a067d
 2012-10-18 16:06:52 -07:00
Fabrice Di Meglio
f9d08423e3 am 6cb9d909: am 8c2bc7cc: am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev 
* commit '6cb9d909f06433c5b9130c55dc08ce8d55e7dac8':
  Fix bug #7374285  GridLayout layout param margins are broken in RTL mode
 2012-10-18 15:31:09 -07:00
Fabrice Di Meglio
6cb9d909f0 am 8c2bc7cc: am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev 
* commit '8c2bc7ccf16f201c10e1a4ffb66f66af63f85a91':
  Fix bug #7374285  GridLayout layout param margins are broken in RTL mode
 2012-10-18 15:29:12 -07:00
Fabrice Di Meglio
8c2bc7ccf1 am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev 
* commit '07f85fecdd9f13a617953c7377ff62b4133b4e30':
  Fix bug #7374285  GridLayout layout param margins are broken in RTL mode
 2012-10-18 15:26:29 -07:00
Fabrice Di Meglio
07f85fecdd Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev 2012-10-18 15:23:41 -07:00
Romain Guy
7c25aab491 Defer layer rendering to avoid stalls 
Bug #7326824

When a layer is taken out of the cache and initialized it gets cleared
to prepare it for future rendering. This triggers the following sequence
of operations:

glBindFramebuffer(layer.fbo)
attach texture storage to FBO
glClear()
glBindFramebuffer(defaultFbo)

The clear forces a resolve on tilers which stalls the CPU for a little
while, thus producing jank during animations. This change moves the
clear to the next frame when we know we will have to execute a resolve
anyway.

Change-Id: Ic1939c25df20ed65a4c48dc81ee549b2cd8b6ec3
 2012-10-18 15:05:02 -07:00