Calin Juravle
af8f2d3351
am 5aede5a2: (-s ours) am 9b5112c3: Merge "Make native bridge property read-only."
...
* commit '5aede5a226b181f602b208c99a4a10b959e967fd':
Make native bridge property read-only.
2014-08-27 13:48:54 +00:00
Calin Juravle
f924c027d3
am 0a63f754: am 729fc678: Merge "Update the handling of the native bridge property." into lmp-dev
...
* commit '0a63f754e6f192539be16f59bda3839aa5d24641':
Update the handling of the native bridge property.
2014-08-27 13:27:49 +00:00
Calin Juravle
5aede5a226
am 9b5112c3: Merge "Make native bridge property read-only."
...
* commit '9b5112c36b5163925cb303c0cd016bf4115c5800':
Make native bridge property read-only.
2014-08-27 13:27:21 +00:00
Calin Juravle
9b5112c36b
Merge "Make native bridge property read-only."
2014-08-27 13:19:20 +00:00
Calin Juravle
fca1ef2c29
am 729fc678: Merge "Update the handling of the native bridge property." into lmp-dev
...
* commit '729fc678bec8d45b120a5c7fc1657952333f4d79':
Update the handling of the native bridge property.
2014-08-27 13:18:32 +00:00
Calin Juravle
6deb439d03
Merge "Update the handling of the native bridge property." into lmp-dev
2014-08-27 13:09:27 +00:00
Selim Cinek
58a3536e60
am a139ca24: am fb24635e: Made quick settings RTL compatible.
...
* commit 'a139ca246353cc450654b00c779744706b65111f':
Made quick settings RTL compatible.
2014-08-27 13:02:48 +00:00
Selim Cinek
cb7d17031c
am 20a161d2: am 73375a57: Added anti-falsing logic to the keyguard.
...
* commit '20a161d2b2a6db12e9366ecc1105938a25920d34':
Added anti-falsing logic to the keyguard.
2014-08-27 13:02:43 +00:00
Selim Cinek
a133fa3a93
am fb24635e: Made quick settings RTL compatible.
...
* commit 'fb24635eeab138667e4394541ae89b0fa71e31cd':
Made quick settings RTL compatible.
2014-08-27 12:52:10 +00:00
Selim Cinek
5fad8b3fa2
am 73375a57: Added anti-falsing logic to the keyguard.
...
* commit '73375a57cb9f3b89a3222ab1eca4796158ad5ea6':
Added anti-falsing logic to the keyguard.
2014-08-27 12:52:02 +00:00
Selim Cinek
06d3bca095
Made quick settings RTL compatible.
...
The layout is now mirrored correctly and the icons as well.
Bug: 15284805
Change-Id: I3d6fadad0a987adb49f826d4189f9dd58e20d326
2014-08-27 12:38:15 +02:00
Selim Cinek
19c8c708f1
Added anti-falsing logic to the keyguard.
...
Newly enforcing a threshold for the following cases:
Unlocking, Dismissing Notifications, Swiping Down Quick settings.
Also increased the affordance threshold slightly.
Bug: 15433087
Change-Id: I723346dedf9ae0e3f8b103182992ab572fc394b9
2014-08-27 12:38:15 +02:00
Jungshik Jang
493ecb1dcd
am d2560b28: am 035edcdf: Allow broadcast for <Set System Audio Mode>.
...
* commit 'd2560b289b4a18f7a4b8aeabb0a30d298a6b21d9':
Allow broadcast for <Set System Audio Mode>.
2014-08-27 09:22:47 +00:00
Jungshik Jang
4d804afc8e
am 035edcdf: Allow broadcast for <Set System Audio Mode>.
...
* commit '035edcdf62d67badd7b9bd6e7fd44bffc790fcca':
Allow broadcast for <Set System Audio Mode>.
2014-08-27 09:10:36 +00:00
Jungshik Jang
473119fdc3
Allow broadcast for <Set System Audio Mode>.
...
AVR may broadcst <Set System Audio Mode> to start system audio mode.
But we do handle direct message case.
Bug: 17292360
Change-Id: I9111f8122d58b31f3801e4e78f283db65e79330b
2014-08-27 16:43:22 +09:00
Jungshik Jang
6421dfc9d1
am 927f0b65: am 82918c93: Merge "Add more debug message to HdmiControlService" into lmp-dev
...
* commit '927f0b6594d4c806e830cb60684e88e41990e97d':
Add more debug message to HdmiControlService
2014-08-27 06:59:01 +00:00
Jungshik Jang
3e754f0b57
am 82918c93: Merge "Add more debug message to HdmiControlService" into lmp-dev
...
* commit '82918c93948fd658f4ad6932ac529cec5ab59b7c':
Add more debug message to HdmiControlService
2014-08-27 06:50:22 +00:00
Jungshik Jang
038c8601c3
Merge "Add more debug message to HdmiControlService" into lmp-dev
2014-08-27 06:39:58 +00:00
Russell Brenner
ac7334d4fd
am c04b259a: am d1d4a28a: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev
...
* commit 'c04b259aa962616089994c8cf225ff396feb1c83':
Print services setting changes not handled for managed profiles.
2014-08-27 06:32:14 +00:00
Andrew Solovay
90ed24fafd
am a4d8d6eb: am 29f4975e: am 3442b412: am 8d8cf0b2: am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs
...
* commit 'a4d8d6eb1ec3983948235631f0071a9d4ba739a0':
docs: Fixed error in code sample.
2014-08-27 06:32:09 +00:00
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
Russell Brenner
e25ca71d04
am d1d4a28a: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev
...
* commit 'd1d4a28a15150018ed60e008c5ff8f40139c578d':
Print services setting changes not handled for managed profiles.
2014-08-27 06:20:17 +00:00
Andrew Solovay
dc84712377
am 29f4975e: am 3442b412: am 8d8cf0b2: am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs
...
* commit '29f4975e77b012c65be3842d77cd4fc110d0938c':
docs: Fixed error in code sample.
2014-08-27 06:20:12 +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
Russell Brenner
e3c638a4fa
Merge branch 'lmp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev
2014-08-27 06:13:55 +00:00
Svetoslav
948397a453
Merge "Print services setting changes not handled for managed profiles." into lmp-dev
2014-08-27 06:13:23 +00:00
Andrew Solovay
81dca12037
am 3442b412: am 8d8cf0b2: am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs
...
* commit '3442b412e15c11c175c83a1340eefa196cb3ab35':
docs: Fixed error in code sample.
2014-08-27 06:12:11 +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
Jungshik Jang
c94ac5cffc
Add more debug message to HdmiControlService
...
Bug: 17291374
Change-Id: I9568dd12b0e5864c50f81bacc2729b82242187c4
2014-08-27 15:09:27 +09: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