Sreeram Ramachandran
9ea3a401e0
am ebb0bdb0: am 9b32f9a4: am 0610ff97: Merge "Don\'t use framework permission strings for netd permissions." into lmp-mr1-dev
...
* commit 'ebb0bdb0f19b4f87f9080e37fb5a7ad540c0ccb2':
Don't use framework permission strings for netd permissions.
2014-11-04 22:19:21 +00:00
Sreeram Ramachandran
ebb0bdb0f1
am 9b32f9a4: am 0610ff97: Merge "Don\'t use framework permission strings for netd permissions." into lmp-mr1-dev
...
* commit '9b32f9a46687c1f9d720452f8972e43f1d15294b':
Don't use framework permission strings for netd permissions.
2014-11-04 22:11:24 +00:00
Sreeram Ramachandran
0610ff97f1
Merge "Don't use framework permission strings for netd permissions." into lmp-mr1-dev
2014-11-04 21:59:23 +00:00
Wale Ogunwale
a9868fbd7b
am 2749a5e6: am e54553c8: am d54b578e: Fix issue #17305377 : Don\'t kill process if it still has tasks.
...
* commit '2749a5e6cec41cbdc019134db6fc96e5283db9b4':
Fix issue #17305377 : Don't kill process if it still has tasks.
2014-11-04 19:22:25 +00:00
Wale Ogunwale
2749a5e6ce
am e54553c8: am d54b578e: Fix issue #17305377 : Don\'t kill process if it still has tasks.
...
* commit 'e54553c841f3ca1ebcb822e8b9ab6a412e7bd895':
Fix issue #17305377 : Don't kill process if it still has tasks.
2014-11-04 19:14:49 +00:00
Wale Ogunwale
d54b578e47
Fix issue #17305377 : Don't kill process if it still has tasks.
...
We previously killed a process when one of its task was
swiped away in the recents UI. This had negative performance
implications for apps with multiple tasks in recents. Now we
will only kill the process if there are no more tasks associated
with it.
Changed also removes the need for the
ActivityManager.REMOVE_TASK_KILL_PROCESS since ActivityManager
will now only kill a task process if it process has no out
standing tasks.
Bug: 17305377
Change-Id: Ibc39bb328d13c7eab05c04798c2f14887923d9d4
2014-11-04 10:59:31 -08:00
Sreeram Ramachandran
0f8f120839
Don't use framework permission strings for netd permissions.
...
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.
Bug: 18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
2014-11-04 10:15:03 -08:00
Adrian Roos
bb89d8499d
am 7515c186: am a5dd432c: am e94a84d2: Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev
...
* commit '7515c1866772384d3d5f561f6639d8b037998647':
Refactor LockSettingsService into storage and logic
2014-11-04 16:54:22 +00:00
Adrian Roos
7515c18667
am a5dd432c: am e94a84d2: Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev
...
* commit 'a5dd432c088487374c08395aed98c7eacdfa791a':
Refactor LockSettingsService into storage and logic
2014-11-04 16:50:28 +00:00
Adrian Roos
261d5ab8f4
Refactor LockSettingsService into storage and logic
...
Creates a new LockSettingsStorage class to handle
stroring and retreiving data.
Bug: 18163444
Change-Id: Ia3bc4ad679c5e1217756ae6b3b80cfce3599baed
2014-11-04 17:38:20 +01:00
Mike Lockwood
d89fab1385
am f9de1025: am 946863b6: Merge "Fix USB audio disconnect logic" into lmp-mr1-dev automerge: 61cf7e0
...
* commit 'f9de10252f96a136784de9d79cfcc1ab9e30d13f':
Fix USB audio disconnect logic
2014-11-03 18:50:15 +00:00
Adrian Roos
9b40ce39f7
am 70fd44fa: am 698078a7: Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev automerge: 7736d37
...
* commit '70fd44fa022351b4451e61a7f0927362f4e33da8':
Improve TrustManagerService user lifecycle
2014-11-03 18:50:06 +00:00
Mike Lockwood
f9de10252f
am 946863b6: Merge "Fix USB audio disconnect logic" into lmp-mr1-dev
...
automerge: 61cf7e0
2014-11-03 18:45:52 +00:00
Adrian Roos
70fd44fa02
am 698078a7: Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev
...
automerge: 7736d37
2014-11-03 18:41:28 +00:00
Mike Lockwood
946863b63c
Merge "Fix USB audio disconnect logic" into lmp-mr1-dev
2014-11-03 18:38:14 +00:00
Adrian Roos
698078a7e9
Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev
2014-11-03 18:33:54 +00:00
Casey Burkhardt
1560b84579
am 1031eb71: am 5e2986ef: am 2997285f: Merge "Disable circular display mask with color inversion" into lmp-sprout-dev automerge: fb80a3b
...
* commit '1031eb71cc21025953df5018398ee70e96ee9ed6':
Disable circular display mask with color inversion
2014-11-03 17:42:15 +00:00
Casey Burkhardt
1031eb71cc
am 5e2986ef: am 2997285f: Merge "Disable circular display mask with color inversion" into lmp-sprout-dev
...
automerge: fb80a3b
2014-11-03 17:28:59 +00:00
Casey Burkhardt
5e2986ef20
am 2997285f: Merge "Disable circular display mask with color inversion" into lmp-sprout-dev
...
* commit '2997285f362349097882d1b31eb23cb867227192':
Disable circular display mask with color inversion
2014-11-03 17:22:13 +00:00
Adrian Roos
cbe614ff7d
Improve TrustManagerService user lifecycle
...
- Only bind agents of running users
- Explicitly clean up state when users are removed
- Delay binding until third-party apps can actually run
Bug: 18102460
Change-Id: I5017adc1634b249068099fc5779ba95904312438
2014-11-03 18:07:11 +01:00
Casey Burkhardt
2997285f36
Merge "Disable circular display mask with color inversion" into lmp-sprout-dev
2014-11-03 16:55:27 +00:00
Adrian Roos
7a5aa7053c
am 670edcb5: am 862d72e2: Merge "Improve dump of status bar service" into lmp-mr1-dev automerge: 8af07f4
...
* commit '670edcb53557b600d9200512a0cf1cdd1fb37bc5':
Improve dump of status bar service
2014-11-03 15:07:15 +00:00
Adrian Roos
670edcb535
am 862d72e2: Merge "Improve dump of status bar service" into lmp-mr1-dev
...
automerge: 8af07f4
2014-11-03 15:02:09 +00:00
Adrian Roos
862d72e2f4
Merge "Improve dump of status bar service" into lmp-mr1-dev
2014-11-03 14:56:48 +00:00
Jason Monk
52eb811a44
am 8efeae7e: am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev automerge: 5c69f5b
...
* commit '8efeae7eb4da19bd3dcf1a5013e3011d50f2ca42':
Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
2014-11-03 14:48:48 +00:00
Jason Monk
8efeae7eb4
am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev
...
automerge: 5c69f5b
2014-11-03 14:42:18 +00:00
Jason Monk
2e647efe01
Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev
2014-11-03 14:36:02 +00:00
Jeff Brown
b3d18f2c2e
am 5177979b: am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e automerge: a80162f
...
* commit '5177979bbd7459179648057ba00a6399aeb26357':
Add a function to boost screen brightness temporarily.
2014-11-01 17:51:16 +00:00
Jeff Brown
5177979bbd
am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e
...
automerge: a80162f
2014-11-01 15:04:52 +00:00
Jeff Brown
0ed053ef53
am e333e674: Add a function to boost screen brightness temporarily.
...
* commit 'e333e674a758c39885d4d9779a1aad387fb0e6aa':
Add a function to boost screen brightness temporarily.
2014-11-01 14:10:46 +00:00
Yohei Yukawa
e504335f7f
am f5051e9b: am 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev automerge: b1f5643
...
* commit 'f5051e9b6771de3558d2b8adf7ef233721dad1d6':
Conditionally allow non-primay profiles to use TextServices
2014-11-01 03:24:18 +00:00
Yohei Yukawa
f5051e9b67
am 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev
...
automerge: b1f5643
2014-11-01 02:19:02 +00:00
Jeff Brown
e333e674a7
Add a function to boost screen brightness temporarily.
...
When PowerManager.boostScreenBrightness() is called, the screen
brightness is set to maximum for 5 seconds. This action is
also considered to be user activity.
Bug: 17934954
Change-Id: I1cb4a03a60705c6c1c5cc9ff84b1c5dbd2932fcd
2014-10-31 18:45:11 -07:00
Yohei Yukawa
22cbf54ca0
Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev
2014-11-01 01:29:26 +00:00
Craig Mautner
c3fdcf749c
am 8252b827: am a1b9e3d7: Merge "Animate starting windows when keyguard dismissed." into lmp-mr1-dev automerge: ec5f374
...
* commit '8252b827db73004bdf97c6ac31f3a58f26148e03':
Animate starting windows when keyguard dismissed.
2014-11-01 00:06:32 +00:00
Craig Mautner
8252b827db
am a1b9e3d7: Merge "Animate starting windows when keyguard dismissed." into lmp-mr1-dev
...
automerge: ec5f374
2014-11-01 00:02:37 +00:00
Craig Mautner
a1b9e3d7ea
Merge "Animate starting windows when keyguard dismissed." into lmp-mr1-dev
2014-10-31 23:55:55 +00:00
Craig Mautner
c0d2d0ad6d
Animate starting windows when keyguard dismissed.
...
Starting windows are displayed prior to their app windows visibility
being set. Consequently the WindowToken.hidden boolean for starting
windows is still true even when it is shown. The keyguard logic uses
the method WindowState.isVisibleNow to determine whether to animate
each window. This method incorrectly determined that starting windows
were not visible based on WindowToken.hidden and consequently didn't
animate in the starting window.
This change fixes isVisibleNow() to correctly determine when
starting windows are visible and animates them in as part of the
keyguard transition.
This change also adds keyguard debug.
Partially fixes bug 15991916.
Change-Id: Iac3e5f3f33876be5801ec619bbe7a1579e648322
2014-10-31 16:33:56 -07:00
Tsuwei Chen
7148e9115c
am ba16fc9d: am 5ef08182: Merge "Reject SUPL connection when data is disbaled by user. b/18127920" into lmp-mr1-dev automerge: e939996
...
* commit 'ba16fc9d06a20b62ffd17b595a7b521c580d752e':
Reject SUPL connection when data is disbaled by user. b/18127920
2014-10-31 23:31:01 +00:00
Dianne Hackborn
bc622ed7c3
am 58f2a1e8: am f34fa3e7: Merge "Improve low on RAM reporting." into lmp-mr1-dev automerge: 1816361
...
* commit '58f2a1e8a47de6c3ce4f588b07fc052f4687492d':
Improve low on RAM reporting.
2014-10-31 23:30:52 +00:00
Tsuwei Chen
ba16fc9d06
am 5ef08182: Merge "Reject SUPL connection when data is disbaled by user. b/18127920" into lmp-mr1-dev
...
automerge: e939996
2014-10-31 23:26:48 +00:00
Dianne Hackborn
58f2a1e8a4
am f34fa3e7: Merge "Improve low on RAM reporting." into lmp-mr1-dev
...
automerge: 1816361
2014-10-31 23:23:40 +00:00
Tsuwei Chen
5ef0818281
Merge "Reject SUPL connection when data is disbaled by user. b/18127920" into lmp-mr1-dev
2014-10-31 23:06:01 +00:00
Dianne Hackborn
f34fa3e7aa
Merge "Improve low on RAM reporting." into lmp-mr1-dev
2014-10-31 22:44:24 +00:00
Mike Lockwood
3d50308c7f
Fix USB audio disconnect logic
...
Previously, disconnecting any USB device would terminate USB audio playback.
Also moved USB audio support to a separate class and did some prep work for
multiple USB audio device support.
Bug: 18203024
Change-Id: I49822c2c47428e658c853b2ec83c7313e626a1cb
2014-10-31 15:28:52 -07:00
Tsuwei Chen
d3ef8e264b
Reject SUPL connection when data is disbaled by user.
...
b/18127920
Change-Id: I6209d7c48bb7c9a81fd3fd9323275e1f6a38d8db
2014-10-31 14:58:44 -07:00
Jason Monk
94cfd9d7c4
Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
...
To prepare for controlling from settings.
While here, add lock to app settings to backups.
Bug: 16957435
Change-Id: I059140cd07a7a0d5ceb4e0bfe5e0176cb96629d3
2014-10-31 14:47:13 -04:00
Dianne Hackborn
6edb5c665d
Improve low on RAM reporting.
...
- Don't print every little native process.
- Print in different sections, so if one is too long we don't get the
rest truncated in the log.
- Include other info from meminfo -- ksm and free/used/lost summary.
Change-Id: Iea4ec3860212667e195d2b60b3ded23bfec78436
2014-10-31 10:35:15 -07:00
Jason Monk
09c04b1041
am c7587dde: am a031ae8c: am e6cd9daf: Merge "Download PAC when set after a diff PAC URL" into lmp-mr1-dev
...
* commit 'c7587ddefa74d6fe8ef01304ec878aa0faeeae2f':
Download PAC when set after a diff PAC URL
2014-10-31 14:29:28 +00:00
Jason Monk
c7587ddefa
am a031ae8c: am e6cd9daf: Merge "Download PAC when set after a diff PAC URL" into lmp-mr1-dev
...
* commit 'a031ae8c825e154838f599fb072bba021e047f73':
Download PAC when set after a diff PAC URL
2014-10-31 14:24:44 +00:00
