Svetoslav
8cf1921fc0
am 7f84ed31: Merge "Dynamically configurable accessibility flags mishandled."
...
* commit '7f84ed31f01997d4906e408c335f783a91d197d5':
Dynamically configurable accessibility flags mishandled.
2013-02-15 15:29:25 -08:00
Svetoslav
7f84ed31f0
Merge "Dynamically configurable accessibility flags mishandled."
2013-02-15 23:26:59 +00:00
Svetoslav
9e065121fa
Dynamically configurable accessibility flags mishandled.
...
A bug was preventing clearing dynamically settable accessibility
service flags.
bug:8051095
Change-Id: I6844b2f44e323bc741ac39983a892f1d28f3132b
2013-02-15 15:24:13 -08:00
Mathias Agopian
76f56dd598
am ceec31b7: Merge changes I5a218ca1,I853a76d9
...
* commit 'ceec31b7dab6a23e443d5dcbcfac4a23b720cfde':
Refactoring: Rename SurfaceTextureClient to Surface
clean-up following Surface split
2013-02-15 14:28:22 -08:00
Mathias Agopian
5280061794
Refactoring: Rename SurfaceTextureClient to Surface
...
Change-Id: I5a218ca11abeeec05e3a4c3cfc581bcc788814ea
2013-02-15 12:47:40 -08:00
Mathias Agopian
29479ebe10
clean-up following Surface split
...
Change-Id: I853a76d92d957ee38a36fcdd280d6407ec316987
2013-02-15 12:47:40 -08:00
Svetoslav
06bab4e2d3
am c145317d: Merge "User switch not handled properly in the accessibility manager service."
...
* commit 'c145317d0b19fbd1e7aff8519696146853367b89':
User switch not handled properly in the accessibility manager service.
2013-02-15 12:33:21 -08:00
Svetoslav
5fec0c5ee5
User switch not handled properly in the accessibility manager service.
...
On user switch the transient state of the old user was not cleared
which means that when we switch back to this user the operational
state such as which event types were dispatched, what state was sent
to local managers, etc is stale. This leads to semi-updated state
and broken behavior. Now if the user becomes inactive, we are clearing
all transient state which will be recreated when the user becomes
active.
bug:8196652
Change-Id: Ie9e0d712b6d567e5074b328f1bb87afaa5395c06
2013-02-15 12:29:17 -08:00
Craig Mautner
924bf18c75
am 22ee9aad: Merge "Reset and reuse Iterators and don\'t new() one."
...
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '22ee9aad834b055df1bd5d5544e37a63edc963fe':
Reset and reuse Iterators and don't new() one.
2013-02-14 19:58:44 -08:00
Kenny Root
647771659c
am 0786207b: am dc7b3e3b: am 9657ba0e: Merge "KeyStore: stop using state()"
...
# Via Android Git Automerger (2) and others
* commit '0786207be59d34a8ba8a7a1e93602002fac97587':
KeyStore: stop using state()
2013-02-14 19:58:33 -08:00
Kristian Monsen
1456758802
resolved conflicts for merge of 58a1ca66 to master-chromium
...
Change-Id: I06b61e6d7d52b584eae03a95220381475b8bff0e
2013-02-14 19:48:27 -08:00
Craig Mautner
22ee9aad83
Merge "Reset and reuse Iterators and don't new() one."
2013-02-14 22:22:35 +00:00
Kenny Root
0786207be5
am dc7b3e3b: am 9657ba0e: Merge "KeyStore: stop using state()"
...
# Via Android Git Automerger (1) and others
* commit 'dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
KeyStore: stop using state()
2013-02-14 12:50:34 -08:00
Craig Mautner
343ad71d7c
Reset and reuse Iterators and don't new() one.
...
Save time and memory by resuing permanent mTmpXxxIterator for
AllWindowsIterator and AppTokenIterator.
Change-Id: I2e5143364651d9471e9e70eee514d3f45d595468
2013-02-14 12:48:53 -08:00
Mathias Agopian
58a1ca6642
Merge "split Surface in two classes: SurfaceControl and Surface"
2013-02-14 20:25:08 +00:00
Mathias Agopian
3866f0d581
split Surface in two classes: SurfaceControl and Surface
...
SurfaceControl is the window manager side; it can
control the attributes of a surface but cannot push buffers
to it. Surface on the other hand is the application (producer)
side and is used to push buffers to the surface.
Change-Id: Ib6754c968924e87e8dd02a2073c7a447f729f4dd
2013-02-14 12:19:11 -08:00
Kenny Root
b9594ce9eb
KeyStore: stop using state()
...
Change-Id: I721974fd95f8d1ab06a3fd1bbb4c9b4d9d1d7752
2013-02-14 12:06:51 -08:00
Craig Mautner
0db3416e37
am 3beb8757: Merge "Remove AppWindowToken lists."
...
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '3beb8757ac9ba0829bf96e067ae32315f1d4bb3f':
Remove AppWindowToken lists.
2013-02-14 11:43:49 -08:00
Craig Mautner
496bdbba30
Remove AppWindowToken lists.
...
No longer necessary.
Change-Id: I0d2b96f69152fb93b6ba56f02ce9693ff1370cbc
2013-02-14 10:56:11 -08:00
Craig Mautner
102f711043
am 534d136a: Merge "Remove unused App methods."
...
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '534d136aa66fb13f7c1b482513627de45c218c29':
Remove unused App methods.
2013-02-14 10:16:57 -08:00
Craig Mautner
534d136aa6
Merge "Remove unused App methods."
2013-02-14 18:13:26 +00:00
Robert Greenwalt
9678c61fec
am fd869887: Merge "Fix a permissions probem in ConnectivityManager"
...
# Via Android (Google) Code Review (1) and Robert Greenwalt (1)
* commit 'fd869887c3477bb2699b72ea752a8466602ea637':
Fix a permissions probem in ConnectivityManager
2013-02-14 08:46:28 -08:00
Robert Greenwalt
fd869887c3
Merge "Fix a permissions probem in ConnectivityManager"
2013-02-14 16:43:33 +00:00
Craig Mautner
ac30688b0a
am f0b36c55: Merge "Refactor setAppOpVisibility implementation."
...
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit 'f0b36c559074718c5e932c20a9931d97d9c061ef':
Refactor setAppOpVisibility implementation.
2013-02-13 22:23:40 -08:00
Craig Mautner
f0b36c5590
Merge "Refactor setAppOpVisibility implementation."
2013-02-14 06:22:32 +00:00
Jeff Sharkey
1f6692f1f9
am aec6bcfb: Merge "Parse network stats using native code."
...
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit 'aec6bcfb767a4b9dfd391bff338a8ff284b29549':
Parse network stats using native code.
2013-02-13 18:14:31 -08:00
Jeff Sharkey
9a2c2a6da9
Parse network stats using native code.
...
Switch to parsing detailed network stats with native code, which
is 71% faster than ProcFileReader.
Change-Id: I2525aaee74d227ce187ba3a74dd08a2b06514deb
2013-02-13 17:40:49 -08:00
Michael Runge
8a593a31e4
am 044dca28: Merge "Add logging for kernel audit failures, including SELinux."
...
# By Geremy Condra
# Via Android (Google) Code Review (1) and Geremy Condra (1)
* commit '044dca285f567863a5ab345ac139f1fa31cac2cc':
Add logging for kernel audit failures, including SELinux.
2013-02-13 16:54:35 -08:00
Michael Runge
044dca285f
Merge "Add logging for kernel audit failures, including SELinux."
2013-02-14 00:52:31 +00:00
Geremy Condra
51611eb728
Add logging for kernel audit failures, including SELinux.
...
Bug: 7707280
Change-Id: I3788b465cb5733c93dbf36c91ce26e37d4be41c2
2013-02-13 16:39:44 -08:00
Svetoslav
f09a297577
am a7d72dfd: Merge "Proper clean up when Ui test automation service is unregistered or dies."
...
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit 'a7d72dfded3437e05c303dc40d61248022eb048b':
Proper clean up when Ui test automation service is unregistered or dies.
2013-02-13 15:52:11 -08:00
Svetoslav
a7d72dfded
Merge "Proper clean up when Ui test automation service is unregistered or dies."
2013-02-13 23:50:37 +00:00
Svetoslav
7379a95a0b
Proper clean up when Ui test automation service is unregistered or dies.
...
The UI test automation service was not removed from the list of
enabled and installed service where it was explicitly added on
registration. This was leaving the accessibility manager service
in an inconsistent state.
bug:8185435
Change-Id: Ice17cdef361fe98ce34f8dd01ec11dbad6c4d0c2
2013-02-13 15:47:32 -08:00
Craig Mautner
8fc72b2a70
am ee6e27c1: Merge "Stop using AppToken movement and start using Task."
...
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit 'ee6e27c122491356f5203b105206a55f0e984fe7':
Stop using AppToken movement and start using Task.
2013-02-13 15:25:23 -08:00
Craig Mautner
b0c0b1fd70
Remove unused App methods.
...
Now that the Task methods have replaced the App methods remove
the App methods.
Change-Id: I0e7432f2c6f99708759ed8c871d20eb5bd38c3c2
2013-02-13 15:24:14 -08:00
Craig Mautner
ee6e27c122
Merge "Stop using AppToken movement and start using Task."
2013-02-13 23:22:27 +00:00
Chris Craik
c932760f66
Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE"
2013-02-13 23:14:58 +00:00
Svetoslav
0726843ea0
Fixing a NPE in accessibility manager service.
...
There was a missing null checks as a result of a recent
refactoring.
bug:8185435
Change-Id: I3a1e256b434755b3a27f609dd2b6aeec31aa9a4f
2013-02-13 14:59:00 -08:00
Craig Mautner
926f3839d8
Stop using AppToken movement and start using Task.
...
Change-Id: I5fbd3b2b692e0e127386051f782b1015515ba384
2013-02-13 11:58:56 -08:00
Craig Mautner
769a5b72dc
Merge "Replace access to mAppTokens with AppTokenIterator"
2013-02-13 19:44:35 +00:00
Jeff Sharkey
eff9918229
Merge "Escape arguments before passing to netd."
2013-02-13 19:29:58 +00:00
Jeff Sharkey
0c232f5a99
Escape arguments before passing to netd.
...
Change-Id: I70bb0cb1e90abd490f8893365c6bdf1844b01d18
2013-02-13 11:27:24 -08:00
Chris Craik
7c1a49f5f5
Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
...
This reverts commit 6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing
changes made to a2cd828b749c444d55c2c41c7dbb85088ff94b9f.
Conflicts:
packages/SystemUI/res/values-sv/strings.xml
Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
2013-02-13 10:50:20 -08:00
Robert Greenwalt
9055ae3697
Fix a permissions probem in ConnectivityManager
...
stopUsingNetworkFeature fails because of new permissions checks in netd.
Change-Id: I04cb10d955c9dd9977c460c6c1db0d1910a863ce
2013-02-12 17:18:25 -08:00
Craig Mautner
30e2d72810
Replace access to mAppTokens with AppTokenIterator
...
More switching from Activity-based to Task-based control.
Change-Id: Ida47d71a52b875a6a6bd77cb62911053f942da15
2013-02-12 16:03:29 -08:00
Amith Yamasani
7f03185fbe
Merge "Hacks to fix lockdown"
2013-02-13 00:01:47 +00:00
Geoffrey Borggaard
e45e45e37e
Hacks to fix lockdown
...
Change-Id: Icf715e84ac7f8bd12eabd01f35860c36a60a8caf
2013-02-12 23:57:20 +00:00
Craig Mautner
bea3b60ed1
Merge "Add AppWindowTokens to TaskList."
2013-02-12 23:57:09 +00:00
Craig Mautner
fb32c6e9e9
Refactor setAppOpVisibility implementation.
...
- Convert double iteration over DisplayContents and WindowLists to
single iteration over AllWindowsIterator.
- Use existing change check in show() and hide() to trigger animation
scheduling rather than propagate change state up through calling tree.
Change-Id: Ic703a9fddebacbd0785bd5a186e95f9d0b128c42
2013-02-12 15:08:44 -08:00
Christopher Tate
559c654801
For now enable backup/restore DEBUG logs
...
Change-Id: I5733251f1e11c8eedb0601ae6751a35134d6419d
2013-02-12 14:57:04 -08:00