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

3542 Commits

Author SHA1 Message Date
Craig Mautner
5f713a86cb am 083f3569: am f9af796e: am a1ca6e00: Merge "When adding an apptoken skip over removed ones." into lmp-dev 
* commit '083f3569b15b519058e9a136b3680eff673184b4':
  When adding an apptoken skip over removed ones.
 2014-08-27 17:55:40 +00:00
Craig Mautner
fb3fdb9495 am f9af796e: am a1ca6e00: Merge "When adding an apptoken skip over removed ones." into lmp-dev 
* commit 'f9af796e5ae81a7eb7775d36d6f8278af0fa9920':
  When adding an apptoken skip over removed ones.
 2014-08-27 17:38:50 +00:00
Craig Mautner
d266368435 Merge "When adding an apptoken skip over removed ones." into lmp-dev 2014-08-27 17:14:18 +00:00
Jorim Jaggi
2d33b1f630 am 925aedb0: am 3d9509d3: am ddf411d6: Merge "Fix that Keyguard didn\'t always get onActivityDrawn call" into lmp-dev 
* commit '925aedb08fcf81994e95424144744feadd5097a7':
  Fix that Keyguard didn't always get onActivityDrawn call
 2014-08-27 17:06:09 +00:00
Craig Mautner
01f79cf916 When adding an apptoken skip over removed ones. 
App tokens are passed from the activity manager to the window
manager along with a list insertion position. That insertion
position presumes that all removed tokens are no longer in window
manager's list. However, when removal of a token is delayed due
to ongoing animation the insertion position was pointing to the
wrong location. This fix skips over tokens that have been marked
for removal when inserting new app tokens.

Fixes bug 15751591.

Change-Id: Ib484c591e2bba9f46ad8e47d60ef05c7bfda0a12
 2014-08-27 09:56:02 -07:00
Jorim Jaggi
339878e1a5 am 3d9509d3: am ddf411d6: Merge "Fix that Keyguard didn\'t always get onActivityDrawn call" into lmp-dev 
* commit '3d9509d3bc6409a5600d23e1ded2eaa431c0cad9':
  Fix that Keyguard didn't always get onActivityDrawn call
 2014-08-27 15:28:28 +00:00
Jorim Jaggi
4c499be0ed Fix that Keyguard didn't always get onActivityDrawn call 
Bug: 16481924
Change-Id: I299645c940c71820aa7dc70985e41da869f1368a
 2014-08-27 16:50:49 +02:00
Jungshik Jang
2df55899a3 am aa587352: am d2560b28: am 035edcdf: Allow broadcast for <Set System Audio Mode>. 
* commit 'aa5873521ae4a7c38aa4fcab9ebd98e4ec32c37e':
  Allow broadcast for <Set System Audio Mode>.
 2014-08-27 10:01:32 +00:00
Jungshik Jang
81cd65b8b4 am a30e6514: am 927f0b65: am 82918c93: Merge "Add more debug message to HdmiControlService" into lmp-dev 
* commit 'a30e6514c88c501590c92e19c5cd9447fb2ba8e8':
  Add more debug message to HdmiControlService
 2014-08-27 09:48:26 +00:00
Russell Brenner
b95cef8ac0 am c9c663d3: am c04b259a: am d1d4a28a: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit 'c9c663d31884f85bbe14a1505051836288b517fb':
  Print services setting changes not handled for managed profiles.
 2014-08-27 09:48:19 +00:00
Dianne Hackborn
b1d1fd0e06 am 7e6e7230: am eb7a0e4e: am 0d006c60: Fix issue #17146552: system anr 
* commit '7e6e7230ebbc7085c2e0bb84741f5f1df0fc45e2':
  Fix issue #17146552: system anr
 2014-08-27 09:47:50 +00: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
Dianne Hackborn
14efe16be5 am e6495bb0: am bad701ee: am 61b7055e: Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev 
* commit 'e6495bb01be4af93f60dff947b66a8ef474ac2af':
  Fix issue #17179314: Make recents limits consistent
 2014-08-27 09:03:49 +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
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
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
Svetoslav
948397a453 Merge "Print services setting changes not handled for managed profiles." into lmp-dev 2014-08-27 06:13:23 +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
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
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
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
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
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
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
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
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
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
d22a667731 Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev 2014-08-27 03:08:02 +00:00
Paul Jensen
5b6ebdabc5 am 4ff3f2c9: am 254cb6b1: am 9a0a9fda: Merge "Fix to allow removing sign-in notification when network removed." into lmp-dev 
* commit '4ff3f2c9e974666d756398946bfcbd08d48d15f8':
  Fix to allow removing sign-in notification when network removed.
 2014-08-27 03:00:21 +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
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
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
Craig Mautner
7dbfbc7d6b Merge "Show IME over keyguard if IME target is showing" into lmp-dev 2014-08-27 00:59:44 +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