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

150351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Svetoslav
86b1df2343 Print services setting changes not handled for managed profiles. 
We keep per user settings for enabled print services which are
observed to update the print manager service state. We were listening
to all user changes but the handling code was not updating the state
of the user whose settings changed, rather the current user.

Added hidden APIs in content observer to know which user changed
and now the print manager serivce handles content changes for the
correct user.

bug:16977006

Change-Id: I71ec88c8f3f38cb405844c13ab83695c2029eb79
 2014-08-26 18:19:13 -07: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
Craig Mautner
7dbfbc7d6b Merge "Show IME over keyguard if IME target is showing" into lmp-dev 2014-08-27 00:59:44 +00:00
Christopher Tate
1871b9352e Merge "Briefly log wallpaper restore outcomes" into lmp-dev 2014-08-27 00:56:19 +00:00
Yorke Lee
5edb638eed Merge "API changes for ContactsContract" into lmp-dev 2014-08-27 00:51:07 +00:00
Jae Seo
fc836f6684 Revert "TIF: Temporarily disable permission check for parental controls" 
This reverts commit 9d197941afcef7853578fcd2d704d6f97dde0902.

Change-Id: Ib376f3d4deddf72b94a5195f7aeafafd3ed189e8
 2014-08-27 00:47:56 +00:00
Christofer Åkersten
8ccb1d6ca7 am e7a96447: Merge "Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS" into lmp-dev 
* commit 'e7a964478d292fe70d1266bf3e1d36060e437c79':
  Ensure system apps can be granted MODIFY_PARENTAL_CONTROLS
 2014-08-27 00:43:58 +00:00
Jungshik Jang
2b8e9504df Merge "Add null-check for system audio mode change event." into lmp-dev 2014-08-27 00:43:19 +00:00