Tim Murray
6964733348
am 2d8cfe60: am 7b0bf2fc: am 29d35997: am cb16b55b: am 2a866f07: Update RenderScript docs.
...
* commit '2d8cfe60cc7b59f3f10c154510d081029535d820':
Update RenderScript docs.
2014-08-27 06:32:04 +00:00
Dianne Hackborn
940434def1
am eb7a0e4e: am 0d006c60: Fix issue #17146552 : system anr
...
* commit 'eb7a0e4e9bcb6a18655c4f349c90216011406d75':
Fix issue #17146552 : system anr
2014-08-27 06:20:11 +00:00
Tim Murray
82e76de29d
am 7b0bf2fc: am 29d35997: am cb16b55b: am 2a866f07: Update RenderScript docs.
...
* commit '7b0bf2fc7567176ec0efc7ce54bd0711cd1eaa32':
Update RenderScript docs.
2014-08-27 06:20:08 +00:00
Tim Murray
bdd5a8f9b9
am 29d35997: am cb16b55b: am 2a866f07: Update RenderScript docs.
...
* commit '29d35997a39faf0a9dfb3bcdd4aac3594ba10ad6':
Update RenderScript docs.
2014-08-27 06:11:57 +00:00
Dianne Hackborn
4d363bcc27
am 0d006c60: Fix issue #17146552 : system anr
...
* commit '0d006c603a8b3a1521dd1bfb0701892c59afd51a':
Fix issue #17146552 : system anr
2014-08-27 06:09:23 +00:00
Dianne Hackborn
5232271a41
Fix issue #17146552 : system anr
...
Add a safe path for Slog.wtf that doesn't acquire an activity manager
lock or block in any way.
Change-Id: I8fef8251a0cb85081442cae55d85063944248d15
2014-08-26 22:55:47 -07:00
Dianne Hackborn
3cc8dbb87e
am bad701ee: am 61b7055e: Merge "Fix issue #17179314 : Make recents limits consistent" into lmp-dev
...
* commit 'bad701ee645948d92982bad90e4d4cfc868e6816':
Fix issue #17179314 : Make recents limits consistent
2014-08-27 04:53:23 +00:00
Jim Miller
bdc2da026f
am b0400d12: am 771ad8b7: Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev
...
* commit 'b0400d12f8f2dd4ad8088fef9c13dcf37bcb9837':
Limit grantTrust() duration to DevicePolicy-imposed limit.
2014-08-27 04:46:25 +00:00
Jae Seo
b35b627173
am b7fa9609: am ad9cd1d5: Merge "TIF: Remove the registered callback when the client process has died" into lmp-dev
...
* commit 'b7fa9609fac4511cda3c345e56b89e63acf9cc29':
TIF: Remove the registered callback when the client process has died
2014-08-27 04:46:21 +00:00
Jinsuk Kim
535b5bf68c
am f77ce65e: am 10f2139d: Merge "Fix a bug that the HdmiCecLocalDeviceTv sends <User Control Released> message for unsupported keys" into lmp-dev
...
* commit 'f77ce65e4fa344653b6d83035d831fe7ca4c6d13':
Fix a bug that the HdmiCecLocalDeviceTv sends <User Control Released> message for unsupported keys
2014-08-27 04:46:16 +00:00
Adam Powell
a80c4a2296
am f6925920: am 78f0a6e5: Merge "Adjust toolbar/action bar title handling" into lmp-dev
...
* commit 'f692592004f011759d9a79824c156b51ab10da13':
Adjust toolbar/action bar title handling
2014-08-27 04:46:11 +00:00
Dianne Hackborn
43da8b6546
am 61b7055e: Merge "Fix issue #17179314 : Make recents limits consistent" into lmp-dev
...
* commit '61b7055e453799c34d5a442b17d774146c81082d':
Fix issue #17179314 : Make recents limits consistent
2014-08-27 04:39:09 +00:00
Dianne Hackborn
80e29b66c5
Merge "Fix issue #17179314 : Make recents limits consistent" into lmp-dev
2014-08-27 04:31:26 +00:00
Dianne Hackborn
852975d537
Fix issue #17179314 : Make recents limits consistent
...
The max limit is now 100 (or 50 on svelte devices), and that is
what everyone used.
Re-arranged things so we have a big expensive "fix the world!"
function for recents that we go in to at only select points:
when first initializing the system, when external storage comes
and goes, and if we detect something wrong with the recents
structure.
With that, now getRecentTasks() and addRecentTaskLocked() are
generally much simpler, doing very little work in most cases.
This will help a lot with scaling up to many more recents
entries.
Change-Id: I7b5ae89edc06568f68c8af54a4420aff7635581c
2014-08-26 21:24:42 -07:00
Dongwon Kang
f20e313bcf
am d03f0825: am c412f6e6: Merge "TIF: clean up pending createSession requests when a package is removed." into lmp-dev
...
* commit 'd03f08256bd3d566eb02847102c1a648f1625d30':
TIF: clean up pending createSession requests when a package is removed.
2014-08-27 04:20:40 +00:00
Alan Viverette
771b4f4c5c
am 11942e90: am 39ee1a53: Merge "Update list preference layout to more closely match Material spec" into lmp-dev
...
* commit '11942e90b325e18afcd6d4d4100328425cc351d7':
Update list preference layout to more closely match Material spec
2014-08-27 04:20:35 +00:00
Chris Craik
287d2314da
am f55719bc: am 7d3073a4: Merge "Crash instead of leaking layers/textures between GL contexts" into lmp-dev
...
* commit 'f55719bcbaeb3b5b57759211e3ea0c99d21c27aa':
Crash instead of leaking layers/textures between GL contexts
2014-08-27 04:20:30 +00:00
Jae Seo
22fdd1d2ec
am 4f14930b: am 16b98b6f: Merge "Revert "TIF: Temporarily disable permission check for parental controls"" into lmp-dev
...
* commit '4f14930bce11b1efeb36c16d3e35f9a9ff981fa2':
Revert "TIF: Temporarily disable permission check for parental controls"
2014-08-27 04:20:25 +00:00
Svetoslav
5bb6b996d4
am c466f26d: am f25081e0: Merge "Fix a crash in PrintSpooler." into lmp-dev
...
* commit 'c466f26da82ba18fb91894129a37b565219c3cc4':
Fix a crash in PrintSpooler.
2014-08-27 04:20:20 +00:00
Craig Mautner
9ea9a37c81
am 9f936d6a: am e0515914: Merge "Show IME over keyguard if IME target is showing" into lmp-dev
...
* commit '9f936d6a6fa506f8bfc2916a426f1f197dd7c156':
Show IME over keyguard if IME target is showing
2014-08-27 04:20:16 +00:00
Christopher Tate
584cce1ce9
am 663c889c: am 7bd36619: Merge "Briefly log wallpaper restore outcomes" into lmp-dev
...
* commit '663c889c750023e6c7109a57f33034a96432fd35':
Briefly log wallpaper restore outcomes
2014-08-27 04:20:12 +00:00
Yorke Lee
84496c7706
am cca60741: am 60a3817c: Merge "API changes for ContactsContract" into lmp-dev
...
* commit 'cca607410716197803663676526cf6368c58a7de':
API changes for ContactsContract
2014-08-27 04:20:06 +00:00
Jungshik Jang
ff2b18e1e3
am d3d36ad4: am 7897e312: Merge "Add null-check for system audio mode change event." into lmp-dev
...
* commit 'd3d36ad41f12e8a0bfac69deacaa8da3ecefc9b1':
Add null-check for system audio mode change event.
2014-08-27 04:19:59 +00:00
Jim Miller
c047a95116
am 771ad8b7: Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev
...
* commit '771ad8b738161c36eb3ba8a58a8d8652f09fbc54':
Limit grantTrust() duration to DevicePolicy-imposed limit.
2014-08-27 03:46:01 +00:00
Jae Seo
72f020604c
am ad9cd1d5: Merge "TIF: Remove the registered callback when the client process has died" into lmp-dev
...
* commit 'ad9cd1d5429ecf4d4f635f2cb95bad0a07c0d36b':
TIF: Remove the registered callback when the client process has died
2014-08-27 03:45:41 +00:00
Jinsuk Kim
cb7b2c0658
am 10f2139d: Merge "Fix a bug that the HdmiCecLocalDeviceTv sends <User Control Released> message for unsupported keys" into lmp-dev
...
* commit '10f2139dedbdf0af078d84bd1380ec8b551562b0':
Fix a bug that the HdmiCecLocalDeviceTv sends <User Control Released> message for unsupported keys
2014-08-27 03:45:36 +00:00
Adam Powell
5915967256
am 78f0a6e5: Merge "Adjust toolbar/action bar title handling" into lmp-dev
...
* commit '78f0a6e56c6830e7415b4e5035c942a85a85095b':
Adjust toolbar/action bar title handling
2014-08-27 03:45:20 +00:00
Christofer Åkersten
46dc0f5145
am 8ddbb2cf: am e7a96447: Merge "Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS" into lmp-dev
...
* commit '8ddbb2cf63f52af38a61faed5f58b89e2dc84aef':
Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS
2014-08-27 03:12:06 +00:00
Jim Miller
d22a667731
Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev
2014-08-27 03:08:02 +00:00
Dongwon Kang
a6ff4d2346
am c412f6e6: Merge "TIF: clean up pending createSession requests when a package is removed." into lmp-dev
...
* commit 'c412f6e68be87ad4176d3d859b38cf4b4909c600':
TIF: clean up pending createSession requests when a package is removed.
2014-08-27 03:01:24 +00:00
Alan Viverette
94a3aa9d66
am 39ee1a53: Merge "Update list preference layout to more closely match Material spec" into lmp-dev
...
* commit '39ee1a53af6e8bc73799fa384f6deca95e9e91b9':
Update list preference layout to more closely match Material spec
2014-08-27 03:01:19 +00:00
Chris Craik
e401dc02c3
am 7d3073a4: Merge "Crash instead of leaking layers/textures between GL contexts" into lmp-dev
...
* commit '7d3073a4b4685764fcdf8c90f90531ab698c9b58':
Crash instead of leaking layers/textures between GL contexts
2014-08-27 03:01:13 +00:00
Jae Seo
0a2551d0c1
am 16b98b6f: Merge "Revert "TIF: Temporarily disable permission check for parental controls"" into lmp-dev
...
* commit '16b98b6f7282c3c95cdd9ad4ecc878c95ceb3d43':
Revert "TIF: Temporarily disable permission check for parental controls"
2014-08-27 03:01:07 +00:00
Svetoslav
0e23dd870a
am f25081e0: Merge "Fix a crash in PrintSpooler." into lmp-dev
...
* commit 'f25081e063e495bf53ac0f5e1ea41b10231145e3':
Fix a crash in PrintSpooler.
2014-08-27 03:01:03 +00:00
Craig Mautner
d7ae9c5a47
am e0515914: Merge "Show IME over keyguard if IME target is showing" into lmp-dev
...
* commit 'e0515914937496003f19f1e76b8f1f2abbddf35c':
Show IME over keyguard if IME target is showing
2014-08-27 03:00:58 +00:00
Christopher Tate
115982fddb
am 7bd36619: Merge "Briefly log wallpaper restore outcomes" into lmp-dev
...
* commit '7bd3661972e644d3b5fa550b9d8ba92de3f57696':
Briefly log wallpaper restore outcomes
2014-08-27 03:00:54 +00:00
Yorke Lee
2b6fababda
am 60a3817c: Merge "API changes for ContactsContract" into lmp-dev
...
* commit '60a3817c487203ecaa4bf26b92d2c7a01ff568a6':
API changes for ContactsContract
2014-08-27 03:00:48 +00:00
Jungshik Jang
eea7d6dc50
am 7897e312: Merge "Add null-check for system audio mode change event." into lmp-dev
...
* commit '7897e312e5dea491e217e902173362ab32d9058e':
Add null-check for system audio mode change event.
2014-08-27 03:00:41 +00:00
Jae Seo
6c79454cfc
Merge "TIF: Remove the registered callback when the client process has died" into lmp-dev
2014-08-27 02:12:56 +00:00
Jinsuk Kim
f34e6075cb
Merge "Fix a bug that the HdmiCecLocalDeviceTv sends <User Control Released> message for unsupported keys" into lmp-dev
2014-08-27 01:59:40 +00:00
Jae Seo
fea8dd45f4
TIF: Remove the registered callback when the client process has died
...
Also make error messages more consistent
Bug: 17276418
Change-Id: Ib87e13e1383db4ff623de2e9b68ae9ff4309360a
2014-08-26 18:37:39 -07:00
Adam Powell
4902a89103
Merge "Adjust toolbar/action bar title handling" into lmp-dev
2014-08-27 01:31:18 +00:00
Adam Powell
af2d85973e
Adjust toolbar/action bar title handling
...
Treat activity title changes as window title changes when propagating
to action bars. This gives it lower priority if a "hard" title has
been set. Fix some lifecycle handling around this that previously
resulted in multiple calls.
Automatically detect the starting display options for a
ToolbarWidgetWrapper if we're not grabbing them from styles. This
prevents setTitle and friends from going totally out to lunch if
constructed around a Toolbar with no starting title.
Bug 17138048
Change-Id: I9f58a3d222546745c8aa873e996b8f0d52a0ad21
2014-08-26 18:28:17 -07:00
Dongil Seo
b64c2ba05b
Fix a bug that the HdmiCecLocalDeviceTv sends <User Control Released> message for unsupported keys
...
Bug: 17170954
Change-Id: I0ad624eb3a1301b24865228164d8dd5a97452329
2014-08-27 10:21:20 +09:00
Dongwon Kang
70613dbff7
Merge "TIF: clean up pending createSession requests when a package is removed." into lmp-dev
2014-08-27 01:17:06 +00:00
Alan Viverette
ec7725c875
Merge "Update list preference layout to more closely match Material spec" into lmp-dev
2014-08-27 01:16:25 +00:00
Chris Craik
9ed43d6514
Merge "Crash instead of leaking layers/textures between GL contexts" into lmp-dev
2014-08-27 01:13:14 +00:00
Dongwon Kang
426c9a4008
TIF: clean up pending createSession requests when a package is removed.
...
Pending createSession request for the package removed led to the tune request
with invalid channel URI. This change prevents crash from invalid URI by cleaning
up the pending requests on the package removal.
Bug: 17214114
Change-Id: I26fdf9eb45a5fec9032926a1c2994831c07b4fbe
2014-08-27 10:11:20 +09:00
Jae Seo
5d0ec89d55
Merge "Revert "TIF: Temporarily disable permission check for parental controls"" into lmp-dev
2014-08-27 01:08:18 +00:00
Svetoslav
ab94674c70
Merge "Fix a crash in PrintSpooler." into lmp-dev
2014-08-27 01:01:55 +00:00