Jeff Sharkey
023c05a341
Move to Global.NETSTATS and Global.NTP constants.
...
Bug: 7157464
Change-Id: Ief10fd37940f62420f5684940994c9f93802e0be
2012-09-14 13:14:21 -07:00
Jim Miller
76d795c313
am f229e4d3: Add support for settings for lock widgets
...
* commit 'f229e4d3eb8f910c181f96416c6798f6f305a395':
Add support for settings for lock widgets
2012-09-14 12:40:05 -07:00
Jim Miller
f229e4d3eb
Add support for settings for lock widgets
...
Change-Id: Iade094c6f32a7653bdbbd4921d345d68f2443ff4
2012-09-14 12:31:24 -07:00
Winson Chung
dfc03e63de
am 49321ec4: Merge "Suppress ExpandHelper on quick settings." into jb-mr1-dev
...
* commit '49321ec4fb30ab0c709c1e808701f63f38f8cbe7':
Suppress ExpandHelper on quick settings.
2012-09-14 12:29:45 -07:00
Winson Chung
9f3b9a138b
am d4726d06: Adding rotation lock tile to quick settings (on tablets).
...
* commit 'd4726d062e277b360046609f35e1aa8572e8e364':
Adding rotation lock tile to quick settings (on tablets).
2012-09-14 12:29:39 -07:00
Winson Chung
d4726d062e
Adding rotation lock tile to quick settings (on tablets).
...
Change-Id: Ia68c07051acc1f0f42dde0b1322db034b5d54506
2012-09-14 12:28:40 -07:00
Winson Chung
49321ec4fb
Merge "Suppress ExpandHelper on quick settings." into jb-mr1-dev
2012-09-14 12:27:55 -07:00
Michael Jurka
2dbb603912
am ad92ce85: Merge "Fix bug with getting widget categories" into jb-mr1-dev
...
* commit 'ad92ce85175a45e5d059f129d2e0627cae60aa82':
Fix bug with getting widget categories
2012-09-14 12:26:28 -07:00
Michael Jurka
1733eb309b
am 95a2ff7c: Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev
...
* commit '95a2ff7cb40d5eb3ca6fe4df0282f45e63d76ae2':
Adding a couple extras keys for keyguard widget selection
2012-09-14 12:23:46 -07:00
Michael Jurka
ad92ce8517
Merge "Fix bug with getting widget categories" into jb-mr1-dev
2012-09-14 12:21:54 -07:00
Raph Levien
600eb7a697
am c1eff085: am e5905684: am eceb3171: am f4afc401: Merge "framework: fix bug for uninitialized variable"
...
* commit 'c1eff0857ebc6abce48ba8c267ab32109dd45ef0':
framework: fix bug for uninitialized variable
2012-09-14 12:21:52 -07:00
Michael Jurka
95a2ff7cb4
Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev
2012-09-14 12:20:08 -07:00
Raph Levien
c1eff0857e
am e5905684: am eceb3171: am f4afc401: Merge "framework: fix bug for uninitialized variable"
...
* commit 'e590568417aa824e7b0e76ae727556d329cb57cf':
framework: fix bug for uninitialized variable
2012-09-14 12:19:03 -07:00
Michael Jurka
ca5e341574
Fix bug with getting widget categories
...
Change-Id: I3b0f410707d37436732c45b572c2f588427a784f
2012-09-14 12:18:51 -07:00
Raph Levien
e590568417
am eceb3171: am f4afc401: Merge "framework: fix bug for uninitialized variable"
...
* commit 'eceb317116d87dada85d06df8fe0e07dd4aec49d':
framework: fix bug for uninitialized variable
2012-09-14 12:16:32 -07:00
Raph Levien
eceb317116
am f4afc401: Merge "framework: fix bug for uninitialized variable"
...
* commit 'f4afc40101c00800c4dc53f165b93f741327416d':
framework: fix bug for uninitialized variable
2012-09-14 12:15:03 -07:00
Dianne Hackborn
5b329e8501
Fix debug log.
...
Change-Id: If65abf43ee7a455b12d49b5800657dbf4489e5b9
2012-09-14 11:54:12 -07:00
Raph Levien
f4afc40101
Merge "framework: fix bug for uninitialized variable"
2012-09-14 11:52:11 -07:00
Svetoslav Ganov
bed49f9d58
am e136a728: Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev
...
* commit 'e136a72810197029a01b4e30b2063d9993b7a9ad':
Text layout in switch may be null when accessibility events are fired.
2012-09-14 11:39:39 -07:00
Christopher Tate
c1e27dc060
am 0dbc4108: Merge "Fix Settings writes to a different user" into jb-mr1-dev
...
* commit '0dbc4108005445d241c5f6990000d25a09a8e00e':
Fix Settings writes to a different user
2012-09-14 11:37:54 -07:00
Svetoslav Ganov
e136a72810
Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev
2012-09-14 11:37:15 -07:00
Svetoslav Ganov
b8c50e8e44
Text layout in switch may be null when accessibility events are fired.
...
1. The layout containing the text of a Switch is initialized on measure
and if an accessibility event is fired before that then a NPE happens.
bug:7169419
Change-Id: Iee3c01ca9157d14d228c4ff33c0810507e0e25a7
2012-09-14 11:36:29 -07:00
Christopher Tate
0dbc410800
Merge "Fix Settings writes to a different user" into jb-mr1-dev
2012-09-14 11:35:19 -07:00
Kenny Root
99b72639a2
am a96fa35e: Merge "Don\'t prematurely delete temporary files" into jb-mr1-dev
...
* commit 'a96fa35e50788d26fc8ab7667ed5000e7b67b26e':
Don't prematurely delete temporary files
2012-09-14 11:22:44 -07:00
Kenny Root
a96fa35e50
Merge "Don't prematurely delete temporary files" into jb-mr1-dev
2012-09-14 11:19:44 -07:00
Romain Guy
77451da220
am 494ac35c: Merge "Multiply alpha for AA as late as possible" into jb-mr1-dev
...
* commit '494ac35c27a0960f57b00bf8457f1956ecf149a2':
Multiply alpha for AA as late as possible
2012-09-14 10:37:15 -07:00
Romain Guy
494ac35c27
Merge "Multiply alpha for AA as late as possible" into jb-mr1-dev
2012-09-14 10:34:47 -07:00
Kenny Root
0b2fa8ca22
Don't prematurely delete temporary files
...
When verification and encryption is used, the temporary file was deleted
prematurely.
Also, on next boot-up, scan the directory we use for temporary files to
clean them up if the user rebooted in the middle of installation.
Bug: 7132197
Change-Id: Ic9e8aab9a664ca00d9ac16f72e53fc43d78d21bc
2012-09-14 10:34:21 -07:00
Jeff Brown
419822e22f
am 2dc6af20: Merge "Fixup a comment." into jb-mr1-dev
...
* commit '2dc6af2082b93849b2e5519a8ae7504757286aa9':
Fixup a comment.
2012-09-14 00:04:15 -07:00
Jeff Brown
2dc6af2082
Merge "Fixup a comment." into jb-mr1-dev
2012-09-14 00:01:06 -07:00
Jeff Brown
565f0425ba
Fixup a comment.
...
Change-Id: I7b73f7e0f0aa903e5cd02d1cdb678e65a6d40e0c
2012-09-14 00:00:17 -07:00
Romain Guy
c4ea87e50d
am 51d71003: Merge "Prevent crash when invalidating all Views Bug #7165793 " into jb-mr1-dev
...
* commit '51d71003e4211b273b8e00adf85389e91ea4bdff':
Prevent crash when invalidating all Views Bug #7165793
2012-09-13 22:55:24 -07:00
Romain Guy
51d71003e4
Merge "Prevent crash when invalidating all Views Bug #7165793 " into jb-mr1-dev
2012-09-13 22:53:13 -07:00
Romain Guy
f84208faf8
Prevent crash when invalidating all Views
...
Bug #7165793
A ViewRootImpl's root view can be null. Check for this condition to
prevent an NPE invalidateWorld(). Other messages perform a similar
check to properly handle the case where mView == null.
Change-Id: I5bcfc41c48a469d38b21be74df2f6c715b0f9352
2012-09-13 22:50:18 -07:00
Baligh Uddin
0c6fb45c26
am cd6e7e1b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'cd6e7e1b5cc69065bcb08f834f0fca7d5ccc57fa':
Import translations. DO NOT MERGE
2012-09-13 22:00:29 -07:00
Baligh Uddin
cd6e7e1b5c
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-13 21:58:41 -07:00
Baligh Uddin
edff7ac86d
am 1a5efec6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '1a5efec6a0ee9034b715a576f5ed108668069d25':
Import translations. DO NOT MERGE
2012-09-13 21:52:36 -07:00
Baligh Uddin
1a5efec6a0
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-13 21:49:37 -07:00
Romain Guy
d33224b35f
am 34186480: Merge "Foundation for tiling optimization" into jb-mr1-dev
...
* commit '34186480640f55aa4bd3c9bdf5319b906525fba2':
Foundation for tiling optimization
2012-09-13 20:33:02 -07:00
Romain Guy
3418648064
Merge "Foundation for tiling optimization" into jb-mr1-dev
2012-09-13 20:31:02 -07:00
Romain Guy
85ef80d890
Foundation for tiling optimization
...
Change-Id: I4db32a4749f196472ba0dde7e102439d2ba4a3a7
2012-09-13 20:26:50 -07:00
Stephen Hines
9249594935
am 2f2f0d40: Merge "Failing uchar4->int4 test" into jb-mr1-dev
...
* commit '2f2f0d40e8d404721167f8dd442fe80e794769d8':
Failing uchar4->int4 test
2012-09-13 19:48:50 -07:00
Stephen Hines
2f2f0d40e8
Merge "Failing uchar4->int4 test" into jb-mr1-dev
2012-09-13 19:45:56 -07:00
Svetoslav Ganov
0e0e91aa9f
am a6d846af: Merge "Fix the build" into jb-mr1-dev
...
* commit 'a6d846afeaa67a503d189bcbc455b31ebe7a15b6':
Fix the build
2012-09-13 19:43:55 -07:00
Svetoslav Ganov
a6d846afea
Merge "Fix the build" into jb-mr1-dev
2012-09-13 19:40:53 -07:00
Svetoslav Ganov
3240ad0f39
Fix the build
...
Change-Id: Ibdabfbd70fe27188be3361792b2886dec78a49d4
2012-09-13 19:40:03 -07:00
Jeff Brown
6e35180586
am 44015010: Merge "Eat copy pasta." into jb-mr1-dev
...
* commit '44015010acefa952b66e8405849314363a52242d':
Eat copy pasta.
2012-09-13 19:28:20 -07:00
Jeff Brown
44015010ac
Merge "Eat copy pasta." into jb-mr1-dev
2012-09-13 19:26:46 -07:00
Jeff Brown
5380a064c3
Eat copy pasta.
...
Change-Id: I74cbad279c15f1999cc68d732fc04d6c448b5c39
2012-09-13 19:24:57 -07:00
Christopher Tate
78d2a66ac1
Fix Settings writes to a different user
...
Oops. Stacked bugs: first, the desired user handle was not properly
being passed from the call() entry point to the database operations;
then on top of that, the client-side cache management was still
looking in the local user's cache for the data, so a request to read
a different user's settings would return the local user's instead if
that key was already known to the local user's cache.
Reads and writes of a different user's settings are now uncached,
so they're relatively much slower. They're rare, however, so this
is not something to worry about unless we encounter a real world
case where it's a significant factor.
This CL also adds a bit of cross-user settings read/write testing
to the existing provider suite. These new tests caught both the
known wrong-user-write bug and discovered the client-side cache
bug, so yay.
Finally, the existing wholesale mutual-exclusion approach would
deadlock in certain circumstances due to the fact that the
settings database creation code might have to call out to the
Package Manager while populating the bookmark/shortcut table,
and the Package Manager would then call back into the settings
provider in the course of handling that request. The synchronization
regime has been significantly tightened up now: now the database
code [which is known to deal with concurrency itself] is allowed
to cope with multiple parallel openers of the same db; this
allows the settings provider to avoid calling out to other parts
of the system even implicitly while its internal lock is held.
Change-Id: Ib77d445b4a2ec658cc5c210830f6977c981f87ed
2012-09-13 19:15:54 -07:00