Svetoslav
6d0c499cc6
am 3e3bbe7a: Merge "Fix a bug in parsing app widget state XML." into lmp-dev
...
* commit '3e3bbe7adcf9721eddcd3b6baa401f53f6e6d969':
Fix a bug in parsing app widget state XML.
2014-09-22 21:51:18 +00:00
Ricardo Cervera
44737ea5e5
am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs
...
* commit '4d0f84bb55957c0f5372b53fe94ddfb53c9d0cf8':
docs: Fixed Developer Tools image. Bug: 17609483
2014-09-22 21:44:13 +00:00
Svetoslav
a3df39cd24
Merge "Loosen the constraint for releasing a shared file." into lmp-dev
2014-09-22 21:40:00 +00:00
Svetoslav
ab4fbefe66
Merge "Fix a bug in parsing app widget state XML." into lmp-dev
2014-09-22 21:39:49 +00:00
Ricardo Cervera
4d0f84bb55
am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs
...
* commit '556f23aa1ae01832611e5e3b4059b47e6a7a00fb':
docs: Fixed Developer Tools image. Bug: 17609483
2014-09-22 21:37:06 +00:00
Ricardo Cervera
556f23aa1a
Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs
2014-09-22 21:26:35 +00:00
John Spurlock
b0fb3736ba
am f8580a4c: am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev
...
* commit 'f8580a4c9240a400c89e1cc894a301070be09e89':
Zen: Add events as a new config attribute.
2014-09-22 21:26:33 +00:00
Alan Viverette
99dd6cc631
am ebabff8d: am 39f73311: Merge "Remove trailing zeroes from vector drawable pathData" into lmp-dev
...
* commit 'ebabff8d83f6793b93bc1f4145d06e5928146ba2':
Remove trailing zeroes from vector drawable pathData
2014-09-22 21:26:29 +00:00
John Spurlock
37486e54d7
am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev
...
* commit 'c018af27d9da4ee3d7dc79103ff35eb54f80a8de':
Zen: Add events as a new config attribute.
2014-09-22 21:15:32 +00:00
Alan Viverette
ce1145ddfb
am 39f73311: Merge "Remove trailing zeroes from vector drawable pathData" into lmp-dev
...
* commit '39f73311737656efab3f99edd47b993a5c2cfa80':
Remove trailing zeroes from vector drawable pathData
2014-09-22 21:15:28 +00:00
John Spurlock
e35c9bf9ba
Merge "Zen: Add events as a new config attribute." into lmp-dev
2014-09-22 21:09:39 +00:00
Alan Viverette
e2aa520598
Merge "Remove trailing zeroes from vector drawable pathData" into lmp-dev
2014-09-22 21:07:10 +00:00
Dianne Hackborn
6e78b35573
am c65a5f33: am f01169a6: Merge "Work on issue #17581375 : Nexus 5 getting low on RAM" into lmp-dev
...
* commit 'c65a5f332b7a900de3fadf407c37415e8585a88f':
Work on issue #17581375 : Nexus 5 getting low on RAM
2014-09-22 21:03:39 +00:00
David Friedman
8ec839c95c
am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file.
...
* commit '6bacce4f24ca05fc95c38ea1e7df75dd176b81c2':
Fixes two typos, one in each file.
2014-09-22 20:51:29 +00:00
Dianne Hackborn
789a7acd8c
am f01169a6: Merge "Work on issue #17581375 : Nexus 5 getting low on RAM" into lmp-dev
...
* commit 'f01169a6c1ca0f668097505151740b56db3294f1':
Work on issue #17581375 : Nexus 5 getting low on RAM
2014-09-22 20:50:56 +00:00
Svetoslav
cf3a86b559
Loosen the constraint for releasing a shared file.
...
In the spooler we have the renderer reading a file to visualize
content and the app writing a file to produce the content. Since
we have to swap the file under the renderer we have a mutex file
provider that both parties can request, use when released, and
release when required. This enables us to request the file which
closes the renderer and when the renderer is closed ask the app
to write some more pages, then open the renderer, and so on. The
mutex file provider was throwing of a thread that does not own
the file thries to relase it which is not needed, this should be
just a nop.
bug:17607134
Change-Id: Id6a2ce92d70077f57978b95315648faf02c13c68
2014-09-22 13:48:44 -07:00
John Spurlock
2dac62c2e9
Zen: Add events as a new config attribute.
...
Decouple events from alarms in the zen interception function,
and default the new allowEvents to true.
Bug:17580878
Change-Id: Iff10df385206ad73c3423ff118c79e94a10918d9
2014-09-22 16:44:37 -04:00
David Friedman
6bacce4f24
am 8dcf1c32: Fixes two typos, one in each file.
...
* commit '8dcf1c32299e2c1c58c053925c572d58f2a74ee9':
Fixes two typos, one in each file.
2014-09-22 20:41:17 +00:00
Dianne Hackborn
19c3b5d0d9
Merge "Work on issue #17581375 : Nexus 5 getting low on RAM" into lmp-dev
2014-09-22 20:40:17 +00:00
Dianne Hackborn
c2f6f947b6
Fix issue #17609716 : Frequent crash in system_server (RT restarts)
...
There was some code here locking on the lock object instead of
the main activity manager lock...!!!
Change-Id: Ic85151fbef915f6fb8fd5ce3c1a7e9b810412cb6
2014-09-22 13:36:42 -07:00
Michael Wright
429bc05e18
am 29c3c189: am 5dd936e7: Merge "Monitor MediaRouter for remote display connections." into lmp-dev
...
* commit '29c3c1891e376f1a6ca84af9ce6bd56ec067dd71':
Monitor MediaRouter for remote display connections.
2014-09-22 20:22:45 +00:00
Michael Wright
e731ea1d37
am 5dd936e7: Merge "Monitor MediaRouter for remote display connections." into lmp-dev
...
* commit '5dd936e74269fb110ae59d110567e21337a9b5d0':
Monitor MediaRouter for remote display connections.
2014-09-22 20:15:59 +00:00
Michael Wright
3119b82c43
Merge "Monitor MediaRouter for remote display connections." into lmp-dev
2014-09-22 20:04:30 +00:00
Alan Viverette
9781c5c736
Remove trailing zeroes from vector drawable pathData
...
Speeds up parseFloat.
BUG: 17391797
Change-Id: I81cf824f6ba97e65ed9628a15ad762c4c9860630
2014-09-22 13:02:37 -07:00
John Spurlock
3c890fc623
am 92b32c41: am afbfb9b5: Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev
...
* commit '92b32c411a9d0acb5abd192ae959b5ed47b88f0a':
Doze: Fix NPE found when pulsing and !dozing.
2014-09-22 19:58:44 +00:00
John Spurlock
ecce707288
am 53a19524: am ff8c16e7: Merge "Zen: Add content description to settings icon." into lmp-dev
...
* commit '53a195240f444ea330f63aebe716cf249519a047':
Zen: Add content description to settings icon.
2014-09-22 19:58:40 +00:00
Ricardo Cervera
4af9fa4b23
docs: Fixed Developer Tools image. Bug: 17609483
...
Change-Id: I400713dfe5ca54da193dccf15dac117dc4e11ca2
2014-09-22 19:56:48 +00:00
Dianne Hackborn
d412563922
Work on issue #17581375 : Nexus 5 getting low on RAM
...
Try to catch any cases where we remove a ProcessRecord from the LRU
list when it may still have a process associated with it, report
that this happened, and try to make sure the process is killed.
Change-Id: Icd74439caba5e1c283c01a49a46dae926a00ba71
2014-09-22 12:52:49 -07:00
Amith Yamasani
ae7034aaf0
Fix regression in launching CantAddAccountActivity for correct user
...
This activity should be launched for the user calling addAccount()
Bug: 17608124
Change-Id: I5d7e47bc625442494dc322ccafdc25f5f5c6aa7b
2014-09-22 12:46:50 -07:00
John Spurlock
51abd935e3
am afbfb9b5: Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev
...
* commit 'afbfb9b5efd8a7ebb320f0b5e8c3003b646705a8':
Doze: Fix NPE found when pulsing and !dozing.
2014-09-22 19:44:49 +00:00
John Spurlock
37758bf5a3
am ff8c16e7: Merge "Zen: Add content description to settings icon." into lmp-dev
...
* commit 'ff8c16e73349bc7c1e47f1ef88276928cd1a7366':
Zen: Add content description to settings icon.
2014-09-22 19:44:44 +00:00
Alan Viverette
c1f82f5254
am 8183ba88: am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev
...
* commit '8183ba888f70ecf34adc7f02389f86f7c78a0aef':
Pass explicit null theme when preloading drawables
2014-09-22 19:37:47 +00:00
John Spurlock
101b785d42
Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev
2014-09-22 19:35:55 +00:00
John Spurlock
b9e9729887
Merge "Zen: Add content description to settings icon." into lmp-dev
2014-09-22 19:35:12 +00:00
Svetoslav
c616b3e2f1
Fix a bug in parsing app widget state XML.
...
When restoring app widget state from XML we read all providers,
hosts, and widgets and only after reading all hosts and providers
for all members of the group we hookup the widgets as they may
cross profile boundary. To esntablish the host-widget and provider-
widget relation we use a tag for the host and the provider that
are assigned before saving the state to XML. When restoring we
are using the tags to match widgets with hosts and providers. The
bug was that we were not clearing the tag of all hosts and providers
before reading from XML as we want the only tags that are defined
to be the ones we are reading. This resulted in wrong app widget
restore for a secondary user.
bug:17505027
Change-Id: I035d8f13142c6b9dbc9d658b82390f9cd8d75e0d
2014-09-22 12:31:04 -07:00
Alan Viverette
d14f290d40
am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev
...
* commit '0dfa4738018b93f576a3fceee2d351505983961f':
Pass explicit null theme when preloading drawables
2014-09-22 19:25:06 +00:00
John Spurlock
58a28eb85e
Doze: Fix NPE found when pulsing and !dozing.
...
Bug:17390492
Change-Id: Id6665c5bb8fa13ee08f68478c601b77a4f9e3f6a
2014-09-22 15:20:52 -04:00
Yohei Yukawa
6ddf9aa85f
am 8fe1ca2c: am b5d063dc: Merge "Work on issue #17506095 : Plumb a new configuration to IMMS" into lmp-dev
...
* commit '8fe1ca2cbbe8334ac4f647f15c04e3cb2189ba3e':
Work on issue #17506095 : Plumb a new configuration to IMMS
2014-09-22 19:20:37 +00:00
Adam Lesinski
9dedbbe49c
am 1aa4db07: am 81745c51: Merge "AAPT: Continuation of public/private attribute fix" into lmp-dev
...
* commit '1aa4db0722f8b73472ec4a4f91626283bed665a7':
AAPT: Continuation of public/private attribute fix
2014-09-22 19:20:33 +00:00
Przemyslaw Szczepaniak
0624dabd40
am 90ae2778: am 299bb1fb: Fix issues with new TTS API
...
* commit '90ae27788d261b331fde781fe06b4309d922d35c':
Fix issues with new TTS API
2014-09-22 19:20:27 +00:00
Jason Monk
2e38545c30
am eeda2131: am 5c2ecf24: Merge "Announce title of QS detail views" into lmp-dev
...
* commit 'eeda2131cd07a4d2aabca383da015035ce93c20f':
Announce title of QS detail views
2014-09-22 19:19:59 +00:00
Jason Monk
a02aea152d
am f09fda20: am f9d996c1: Fix status bar cast icon not updating
...
* commit 'f09fda20edae6a126513c658a89eec15361382fa':
Fix status bar cast icon not updating
2014-09-22 19:19:55 +00:00
Ruben Brunk
909cfbe062
am ee38cd33: am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev
...
* commit 'ee38cd33a91f9c153ef2b12d383766a314dfd95a':
camera2: Avoid setting null metering regions in LEGACY.
camera2: Fix JPEG orientation set by LEGACY request.
2014-09-22 19:19:39 +00:00
John Spurlock
453b35e2c4
am 797fd661: am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev
...
* commit '797fd661e8bbe504dfb4378ac10de1181dc62f6b':
Doze: Ensure a doze reset happens after leaving keyguard.
2014-09-22 19:19:35 +00:00
Yigit Boyar
ccf5d24b7a
am a9faefb3: am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev
...
* commit 'a9faefb370e9eb63ffd956507f7f854a89122759':
Allow fallback to Toolbar's default Navigation Icon
2014-09-22 19:19:15 +00:00
Sailesh Nepal
4014ff4daf
am 55c58d01: am 5fb8a942: Merge "Pass disconnect reason for failed remote connections" into lmp-dev
...
* commit '55c58d019c744c52e7b8e4451007371b55eb1127':
Pass disconnect reason for failed remote connections
2014-09-22 19:19:02 +00:00
Ruben Brunk
ee99c63f75
am 252bfab5: am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev
...
* commit '252bfab5897109603cd009e9cb8a73e0622c2a10':
camera2: refactor LEGACY mode error handling.
2014-09-22 19:18:56 +00:00
Baligh Uddin
295a352bac
am b360a75b: (-s ours) am 6564aa05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'b360a75b81f26a67bfc77ad6c92a23fac400de96':
Import translations. DO NOT MERGE
2014-09-22 19:18:35 +00:00
Baligh Uddin
c6dbf0751a
am df22ae1a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'df22ae1ac964344cb7f24ecfad0fb7b370138da3':
Import translations. DO NOT MERGE
2014-09-22 19:18:26 +00:00
Svetoslav
8d109485ab
am 562f38ee: am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev
...
* commit '562f38ee11c9bc5dc20e5fe8740dfea9ab54db42':
Fix memory leak in accessibility cache.
2014-09-22 19:18:22 +00:00