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

3441 Commits

Author SHA1 Message Date
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
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
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
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
Jungshik Jang
2b8e9504df Merge "Add null-check for system audio mode change event." into lmp-dev 2014-08-27 00:43:19 +00:00
Paul Jensen
5b79ba4394 am 254cb6b1: am 9a0a9fda: Merge "Fix to allow removing sign-in notification when network removed." into lmp-dev 
* commit '254cb6b1a6ddb79353fc7277dc3f281f8030d82c':
  Fix to allow removing sign-in notification when network removed.
 2014-08-27 00:43:05 +00:00
Craig Mautner
99b69286f1 Show IME over keyguard if IME target is showing 
IME was being hidden by keyguard even if the window it was attached
to was showing. This change shows the IME if the window it is
attached to is hiding the keyguard.

Also fix an NPE that was crashing systemui.

Fixes bug 16457525.

Change-Id: If587eefa7b1e0ae26713906a76c0766ebaae69a6
 2014-08-26 17:10:39 -07:00
Paul Jensen
e30735c7dc Merge "Fix to allow removing sign-in notification when network removed." into lmp-dev 2014-08-26 23:58:40 +00:00
Jeff Hao
2583ced835 am c4ef03d0: am 73fb1feb: Merge "Add sample profiling option to am." into lmp-dev 
* commit 'c4ef03d0144ca92957724d142c9511bcc5603094':
  Add sample profiling option to am.
 2014-08-26 23:25:44 +00:00
Jeff Hao
1b012d302b Add sample profiling option to am. 
Also bundles all profiling options into a class.

Bug: 17040932
Change-Id: I85d675ee1494bdc7308caffdf94145d27c996e9d
 2014-08-26 15:54:25 -07:00
Christoph Studer
b098d05850 am 26a0be5d: am 6011b66d: Merge "NoMan: Fix inconsistent notification comparator" into lmp-dev 
* commit '26a0be5d2156f401c45745ae771fec5b1942df42':
  NoMan: Fix inconsistent notification comparator
 2014-08-26 22:23:17 +00:00
Christoph Studer
0a2980b83a am b3326cdc: am fc00943b: Merge "NoMan: Cancel children when update removes summary" into lmp-dev 
* commit 'b3326cdcecd593fa1b2cd4ce117a86d46927b309':
  NoMan: Cancel children when update removes summary
 2014-08-26 22:00:44 +00:00
Christoph Studer
cd4adf8b5e NoMan: Fix inconsistent notification comparator 
Switch second phase of notification sorting to lexicographic
string comparison in order to enforce a consistent comparison.

Note that this slightly changes the logic: Within groups we
previously fell back on authoritative rank comparison when
one of the notificiations didn't have a sort key. Now we
just replace missing sort keys with " ".

Bug: 16626175
Change-Id: I91f4f4afeeb2c8edda6cd2668011a7367795086c
 2014-08-26 23:56:27 +02:00
Christoph Studer
f50d82a1e4 Merge "NoMan: Cancel children when update removes summary" into lmp-dev 2014-08-26 21:17:18 +00:00
Jeff Sharkey
5784e197a8 am f3f849d1: am 206f982b: Merge "Treat moving app as installing in new location." into lmp-dev 
* commit 'f3f849d1dffccf8f2e60e33f38085aae503bdd51':
  Treat moving app as installing in new location.
 2014-08-26 20:50:34 +00:00
Paul Jensen
52baba9086 am dd46fb1f: am 96fff1a7: Merge "Implement VpnConfig.addAllowedApplication()." into lmp-dev 
* commit 'dd46fb1f205412681eb86f1ea5535088cd55b3e3':
  Implement VpnConfig.addAllowedApplication().
 2014-08-26 20:29:33 +00:00
Jeff Sharkey
264a5f5b34 Merge "Treat moving app as installing in new location." into lmp-dev 2014-08-26 20:29:13 +00:00
Dianne Hackborn
302da59d8b am f1bb15d2: am 55953caa: Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev 
* commit 'f1bb15d214bdb70e348ee7d649c1249a67434534':
  Fix issue #16311398: Limit number of documents a process can open
 2014-08-26 20:13:59 +00:00
Paul Jensen
5b62d263a7 Merge "Implement VpnConfig.addAllowedApplication()." into lmp-dev 2014-08-26 20:09:00 +00:00
Dianne Hackborn
4610545dd2 Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev 2014-08-26 19:56:26 +00:00
Calin Juravle
ca989888e2 am e956c7f0: am 2fb4f93e: Merge "Pass vmSafeMode (manifest attribute) to installd." into lmp-dev 
* commit 'e956c7f02cd51b577f46105620bb003059a2a87f':
  Pass vmSafeMode (manifest attribute) to installd.
 2014-08-26 19:32:57 +00:00
Amith Yamasani
5b1b6e217e am 619f2063: am a245f91c: Merge "Fix SetupWizard crash when creating Guest or Restricted profile" into lmp-dev 
* commit '619f20634b5e5578700ffdef98510fcc335dda71':
  Fix SetupWizard crash when creating Guest or Restricted profile
 2014-08-26 19:14:43 +00:00
Calin Juravle
d68f83cc47 Merge "Pass vmSafeMode (manifest attribute) to installd." into lmp-dev 2014-08-26 19:10:25 +00:00
Amith Yamasani
1771d39ebf Merge "Fix SetupWizard crash when creating Guest or Restricted profile" into lmp-dev 2014-08-26 19:02:18 +00:00
Winson Chung
c46977c508 am 77b91f7d: am 319b4b57: Merge "Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)" into lmp-dev 
* commit '77b91f7d87a9994348364a912d3127be2595d5ed':
  Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)
 2014-08-26 18:42:19 +00:00
Georgi Nikolov
97f3d7e093 am 6f7beb16: am 172d3b87: Merge "Add maximum time-out to sync operation" into lmp-dev 
* commit '6f7beb160567d261f3b4da285d2f5bbfd2b43919':
  Add maximum time-out to sync operation
 2014-08-26 18:31:22 +00:00