drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153,530 Commits 1 Branch 0 Tags
Commit Graph

153530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jim Miller
d262f6941f am b4a5c851: am b0400d12: am 771ad8b7: Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev 
* commit 'b4a5c8511288c1a4e234120bbb3b32d0980c47e3':
  Limit grantTrust() duration to DevicePolicy-imposed limit.
 2014-08-27 05:00:45 +00:00
Jae Seo
3ed1bbe7e4 am 561b6bb4: am b7fa9609: am ad9cd1d5: Merge "TIF: Remove the registered callback when the client process has died" into lmp-dev 
* commit '561b6bb47ac9ed7208a715db8883c7de1e03390b':
  TIF: Remove the registered callback when the client process has died
 2014-08-27 05:00:40 +00:00
Jinsuk Kim
775f2d52f8 am c8e0df11: am f77ce65e: am 10f2139d: Merge "Fix a bug that the HdmiCecLocalDeviceTv sends <User Control Released> message for unsupported keys" into lmp-dev 
* commit 'c8e0df11c75a81918f92e4e2b4c3fce80f8d807d':
  Fix a bug that the HdmiCecLocalDeviceTv sends <User Control Released> message for unsupported keys
 2014-08-27 05:00:35 +00:00
Adam Powell
c55fd9e225 am 3f9989e0: am f6925920: am 78f0a6e5: Merge "Adjust toolbar/action bar title handling" into lmp-dev 
* commit '3f9989e0e7fa5ce8a425bb95d1957126e2630459':
  Adjust toolbar/action bar title handling
 2014-08-27 05:00:30 +00: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
Dongwon Kang
adf6a68afe am 1123e0d1: am d03f0825: am c412f6e6: Merge "TIF: clean up pending createSession requests when a package is removed." into lmp-dev 
* commit '1123e0d11bc152f749d059b1c6298663052fca4c':
  TIF: clean up pending createSession requests when a package is removed.
 2014-08-27 04:34:35 +00:00
Alan Viverette
4593ea4786 am efa85145: am 11942e90: am 39ee1a53: Merge "Update list preference layout to more closely match Material spec" into lmp-dev 
* commit 'efa851450a2e68ff47e1e8e15da26e046e2b4b7c':
  Update list preference layout to more closely match Material spec
 2014-08-27 04:34:31 +00:00
Chris Craik
4be698fad5 am 11ed894a: am f55719bc: am 7d3073a4: Merge "Crash instead of leaking layers/textures between GL contexts" into lmp-dev 
* commit '11ed894a043a193baa5ec004e0cf376eab9f21eb':
  Crash instead of leaking layers/textures between GL contexts
 2014-08-27 04:34:26 +00:00
Jae Seo
d99216de51 am d105546b: am 4f14930b: am 16b98b6f: Merge "Revert "TIF: Temporarily disable permission check for parental controls"" into lmp-dev 
* commit 'd105546ba53df05b845bdce789138bba07cf5702':
  Revert "TIF: Temporarily disable permission check for parental controls"
 2014-08-27 04:34:21 +00:00
Svetoslav
890052f07f am f5b5d4a5: am c466f26d: am f25081e0: Merge "Fix a crash in PrintSpooler." into lmp-dev 
* commit 'f5b5d4a5ab3bb0961d2f7097d73a150a2fbe811e':
  Fix a crash in PrintSpooler.
 2014-08-27 04:34:16 +00:00
Craig Mautner
29833e0317 am 7cf6e4f3: am 9f936d6a: am e0515914: Merge "Show IME over keyguard if IME target is showing" into lmp-dev 
* commit '7cf6e4f3e1d2dacee59534d6ace56f5f40472896':
  Show IME over keyguard if IME target is showing
 2014-08-27 04:34:11 +00:00
Christopher Tate
0cff332a68 am 569464bb: am 663c889c: am 7bd36619: Merge "Briefly log wallpaper restore outcomes" into lmp-dev 
* commit '569464bbdedb099616015351d1c8ee377f72d737':
  Briefly log wallpaper restore outcomes
 2014-08-27 04:33:58 +00:00
Yorke Lee
2822d16b02 am 14407ed0: am cca60741: am 60a3817c: Merge "API changes for ContactsContract" into lmp-dev 
* commit '14407ed0cc8d23c4bbf6609611d522c0986894c1':
  API changes for ContactsContract
 2014-08-27 04:33:54 +00:00
Jungshik Jang
fc40ddbbbc am 80b47f03: am d3d36ad4: am 7897e312: Merge "Add null-check for system audio mode change event." into lmp-dev 
* commit '80b47f037299a98ac0deb3bdaa056a29df1fb08e':
  Add null-check for system audio mode change event.
 2014-08-27 04:33:48 +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
070bf912a2 am c957fa3b: am 8ddbb2cf: am e7a96447: Merge "Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS" into lmp-dev 
* commit 'c957fa3bcc42ebed337582f98c8ebb8f2d1148e5':
  Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS
 2014-08-27 03:26:37 +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