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

92732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
5ce3b47fe1 am f46476cd: am 19f2b16c: am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev 
* commit 'f46476cd154a4cf81c9d756a6dbc2330f04adf80':
  Cannot pan in browser if magnification is enabled.
 2012-10-19 14:55:55 -07:00
Svetoslav Ganov
f46476cd15 am 19f2b16c: am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev 
* commit '19f2b16cb6b4f488b31861e1f572ec4f71ffd69e':
  Cannot pan in browser if magnification is enabled.
 2012-10-19 14:53:23 -07:00
Svetoslav Ganov
19f2b16cb6 am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev 
* commit '9823723d0f0bb47dfd3a6b251d7155dc1eb0918b':
  Cannot pan in browser if magnification is enabled.
 2012-10-19 14:50:02 -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
Svetoslav Ganov
9823723d0f Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev 2012-10-19 14:46:40 -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
Adam Cohen
bd00735d35 am f9a3616b: am 7ff0fa48: am 6dad395c: Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev 
* commit 'f9a3616bc9267cd13a1804d8350ba49a1581a28d':
  Fix transition into Recents with live wallpaper
 2012-10-19 13:26:55 -07:00
Adam Cohen
f9a3616bc9 am 7ff0fa48: am 6dad395c: Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev 
* commit '7ff0fa48c2e4ae7f0684f28d40e39852211f23a0':
  Fix transition into Recents with live wallpaper
 2012-10-19 13:22:57 -07:00
Irfan Sheriff
5d3f8edf97 am 93462385: am cacc4792: am 61e42262: Fix group join CTS test 
* commit '93462385d4e1515a7011b7d1df54ebbd901bab8c':
  Fix group join CTS test
 2012-10-19 13:22:27 -07:00
Adam Cohen
7ff0fa48c2 am 6dad395c: Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev 
* commit '6dad395ca8d5ff4ae278ac82a6de7a1ed2e36b49':
  Fix transition into Recents with live wallpaper
 2012-10-19 13:19:25 -07:00
Adam Cohen
6dad395ca8 Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev 2012-10-19 13:17:54 -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
Irfan Sheriff
93462385d4 am cacc4792: am 61e42262: Fix group join CTS test 
* commit 'cacc47920795ad0421f056004c03984a8e114b8b':
  Fix group join CTS test
 2012-10-19 12:43:21 -07:00
Irfan Sheriff
cacc479207 am 61e42262: Fix group join CTS test 
* commit '61e42262000549b78843f0959043fec8367ed189':
  Fix group join CTS test
 2012-10-19 12:40:40 -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
Irfan Sheriff
61e4226200 Fix group join CTS test 
Bug: 7379336
Change-Id: I20ead7e8c0d855be523bdfd8d9cb9eaa4b8fcac1
 2012-10-19 12:30:47 -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
Jeff Sharkey
ca1a3171ba am 45dec78c: am e4109957: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev 
* commit '45dec78cde513f0a2e309e548eb2f0df3b0b7497':
  Parcel VpnProfile without using disk format.
 2012-10-19 11:21:27 -07:00
Jeff Sharkey
45dec78cde am e4109957: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev 
* commit 'e4109957ecaabf1e6843a4cde4dcfac9d37fef23':
  Parcel VpnProfile without using disk format.
 2012-10-19 11:18:22 -07:00
Jeff Sharkey
e4109957ec am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev 
* commit 'ba0372db366e63fa928ba83f3ad8c064c51ac8e0':
  Parcel VpnProfile without using disk format.
 2012-10-19 11:16:41 -07:00
Jeff Sharkey
ba0372db36 Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev 2012-10-19 11:12:59 -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
Jeff Sharkey
6e7aa77565 Parcel VpnProfile without using disk format. 
The on-disk format of VpnProfile only stores the username/password
when saveLogin is set, which was dropping them across IPC boundaries.

Bug: 7378327
Change-Id: I30c16efb358ab8f8d3d9229bbf9811146fe034ce
 2012-10-19 10:48:11 -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
Maurice Chu
32d7f8cb86 Merge "Enhance AIDL to take an explicit id for methods" 2012-10-19 10:34:10 -07:00
Justin Koh
f991659c11 am e2c0feb5: am 75c61d83: Merge "Add appliance mode handling for WiFi Direct invitation dialog." into jb-mr1-aah-dev 
* commit 'e2c0feb53651cd943c91a8649ffec61efb2ae4fa':
  Add appliance mode handling for WiFi Direct invitation dialog.
 2012-10-19 10:19:00 -07:00
Justin Koh
e2c0feb536 am 75c61d83: Merge "Add appliance mode handling for WiFi Direct invitation dialog." into jb-mr1-aah-dev 
* commit '75c61d83bffcbbf9b0518cb034e078b640e2095f':
  Add appliance mode handling for WiFi Direct invitation dialog.
 2012-10-19 10:17:13 -07:00
Justin Koh
75c61d83bf Merge "Add appliance mode handling for WiFi Direct invitation dialog." into jb-mr1-aah-dev 2012-10-19 10:13:35 -07:00
Michael Jurka
833808d0c6 Fix transition into Recents with live wallpaper 
Fixes regression introduced by:
738cfc9105
(Fixing wallpaper flash when going in/out of Recents)
 2012-10-19 19:12:29 +02: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
Michael Jurka
6f57d5a6fb am 20124e4d: am 9019335c: am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev 
* commit '20124e4d5e3eae346be85d14017a90d38ebd1558':
  Fixing wallpaper flash when going in/out of Recents
 2012-10-19 09:14:50 -07:00
Michael Jurka
25acafc88d am d200e898: am aee6cbd4: am 80343f64: Fix recents animations for secondary users 
* commit 'd200e8987d955a17078cdfc31d6e8362542bc2d4':
  Fix recents animations for secondary users
 2012-10-19 09:14:46 -07:00
Michael Jurka
20124e4d5e am 9019335c: am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev 
* commit '9019335cd2daa896781f8d1ac67301f0f1b70ad9':
  Fixing wallpaper flash when going in/out of Recents
 2012-10-19 09:11:26 -07:00
Michael Jurka
d200e8987d am aee6cbd4: am 80343f64: Fix recents animations for secondary users 
* commit 'aee6cbd41546ca0fb85866ab1c8a865da727c19f':
  Fix recents animations for secondary users
 2012-10-19 09:11:22 -07:00
Michael Jurka
9019335cd2 am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev 
* commit 'e9687ba8bdccc27f98fe1dcdc48faac0c0de4c18':
  Fixing wallpaper flash when going in/out of Recents
 2012-10-19 09:09:06 -07:00