Adam Powell
4e6e12c88e
am 1ac37924: am 4873c549: am 39e94ebe: Handle single-choice ChooserActivities and bound ChooserTargetServices
...
* commit '1ac3792491743ead048e0a85a5656cf33956da64':
Handle single-choice ChooserActivities and bound ChooserTargetServices
2015-09-16 21:20:04 +00:00
Adam Powell
4873c549f7
am 39e94ebe: Handle single-choice ChooserActivities and bound ChooserTargetServices
...
* commit '39e94ebe22d4959facea4c3621a0a5377242a570':
Handle single-choice ChooserActivities and bound ChooserTargetServices
2015-09-16 21:02:58 +00:00
Adam Powell
39e94ebe22
Handle single-choice ChooserActivities and bound ChooserTargetServices
...
Fix cases where we could try to unbind from a ChooserTargetService
that is not connected. This could happen if we still had stale replies
coming back after the activity was destroyed.
Always offer users an explicit choice in ChooserActivity, don't
auto-start a single option.
Make sure we don't allow a wedged ChooserTargetService to hold a hard
reference to the ChooserActivity via its internal result callback.
Bug 23152483
Change-Id: I7c8b1fc9559dcd477702ef582011b088b07d646b
(cherry picked from commit 9761ab2a64
2015-09-16 19:54:24 +00:00
Andres Morales
3b715ce887
am 8d9ba684: am 5b78fda9: am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev
...
* commit '8d9ba684982cb2e1d2d86e77484bc8772c8ff328':
reset lockout deadline on device reboot
2015-09-16 16:27:09 +00:00
Andres Morales
5b78fda91e
am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev
...
* commit '38e6e4ef98ea1f116902725c282df9fb061a224e':
reset lockout deadline on device reboot
2015-09-16 16:12:03 +00:00
Andres Morales
38e6e4ef98
Merge "reset lockout deadline on device reboot" into mnc-dr-dev
2015-09-16 16:04:56 +00:00
Jorim Jaggi
0fb3f695cc
am 17076cc2: am 5a9bb951: resolved conflicts for 5d0e02b6 to cw-e-dev
...
* commit '17076cc262ff7e6b384bcb7354983c21ac33a8e9':
Add double-tap power button to open camera 1/2
2015-09-10 01:06:47 +00:00
Jorim Jaggi
5a9bb9516d
resolved conflicts for 5d0e02b6 to cw-e-dev
...
Change-Id: Id974d29581304dc644659d1c470b5413d847944b
2015-09-09 17:49:57 -07:00
Jorim Jaggi
5d0e02b64e
Merge "Add double-tap power button to open camera 1/2" into mnc-dr-dev
2015-09-10 00:25:59 +00:00
Jorim Jaggi
35a88c065e
am f27035d9: am 131d541a: am 16093fe3: Revert "Disable fingerprint after force lock"
...
* commit 'f27035d9ee506e4f817ccd49ab60df541c25bbe7':
Revert "Disable fingerprint after force lock"
2015-09-10 00:21:30 +00:00
Jorim Jaggi
131d541ae1
am 16093fe3: Revert "Disable fingerprint after force lock"
...
* commit '16093fe3f0d824731a53a264a132504deb08421a':
Revert "Disable fingerprint after force lock"
2015-09-10 00:05:38 +00:00
Jorim Jaggi
16093fe3f0
Revert "Disable fingerprint after force lock"
...
Bug: 23827042
This reverts commit 0cb50efdc2
2015-09-10 00:00:29 +00:00
Adrian Roos
5941c98c64
Add double-tap power button to open camera 1/2
...
Bug: 23787555
Change-Id: I052b64748f155c59fbb649b32265f559423a8845
2015-09-09 16:57:14 -07:00
Andres Morales
a4e2337566
reset lockout deadline on device reboot
...
Gatekeeper retains lockouts after reboot, but framework
doesn't. This causes odd behavior on a reboot after a lockout
as gatekeeper refuses to check the password and the framework
thinks it's an invalid attempt. Reset the lockout deadline
if we notice the clock reset in the framework.
Bug: 23681267
Change-Id: I3127ccd8f205494af5a8ed2b44d4370c37cc2f8f
2015-09-09 15:45:31 -07:00
Yasuhiro Matsuda
e651ee9bef
am 10191dd9: am 53f1a815: Merge "Remove unnecessary finally blocks for tracing."
...
* commit '10191dd9d20f589fd6f7868a350c104372a57687':
Remove unnecessary finally blocks for tracing.
2015-09-04 02:47:52 +00:00
Yasuhiro Matsuda
10191dd9d2
am 53f1a815: Merge "Remove unnecessary finally blocks for tracing."
...
* commit '53f1a815b4401f10cd833217143da44ab0408dcc':
Remove unnecessary finally blocks for tracing.
2015-09-04 02:34:58 +00:00
Adrian Roos
5b92de04b7
am 6bd2f87e: am bd2ad550: am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
...
* commit '6bd2f87ee4eac554646c5b04c44b6e3402bac84e':
Don't disable fingerprint when entering wrong credential
2015-09-03 20:07:30 +00:00
Adrian Roos
bd2ad550c5
am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
...
* commit '34411e8fecab310a0402bd77e8fe5a5a488a783a':
Don't disable fingerprint when entering wrong credential
2015-09-03 19:46:45 +00:00
Adrian Roos
34411e8fec
Merge "Don't disable fingerprint when entering wrong credential" into mnc-dr-dev
2015-09-03 19:42:39 +00:00
Adrian Roos
af4ab3e2d3
Don't disable fingerprint when entering wrong credential
...
Bug: 23748205
Change-Id: I0ee2a0562d5ef2992a6a4b40d235601b19dcef16
2015-09-03 12:34:12 -07:00
Yasuhiro Matsuda
25878b2888
Remove unnecessary finally blocks for tracing.
...
BUG: 22207144
Change-Id: I2b15bb7c4055a1ad589b433d4f253868813ab311
2015-09-03 16:27:13 +09:00
Clara Bayarri
3b60f72fba
am 9b126882: am 01232c50: am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev
...
* commit '9b126882e61f2a1c3b0d1876c2bea3b38bbbafed':
Fix Custom action mode menu item onclick is not working
2015-09-03 06:21:25 +00:00
Yasuhiro Matsuda
fcf9ab5ab3
am ebf9465d: resolved conflicts for merge of ef57e5e0 to stage-aosp-master
...
* commit 'ebf9465d213336819b15e3b21d02afce64470d4f':
Add trace code to system server.
2015-09-02 14:31:26 +00:00
Yasuhiro Matsuda
ebf9465d21
resolved conflicts for merge of ef57e5e0 to stage-aosp-master
...
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
2015-09-02 22:57:53 +09:00
Clara Bayarri
01232c508e
am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev
...
* commit '582b186cd3b41c5c67649ae2ba9176c3860ab1ec':
Fix Custom action mode menu item onclick is not working
2015-09-02 10:10:47 +00:00
Clara Bayarri
582b186cd3
am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev
...
* commit 'f7b220ab9f62be3d279e3fa7923c249ff0fa09f3':
Fix Custom action mode menu item onclick is not working
2015-09-02 09:59:36 +00:00
Clara Bayarri
ea2d644923
Fix Custom action mode menu item onclick is not working
...
BUG: 23575152
Change-Id: I7c07a769bd03c2d756e04f16296f418e965a993f
2015-09-01 17:18:05 +01:00
Adrian Roos
e803c9ed7f
am 9cb060d0: am 7e1775d2: am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev
...
* commit '9cb060d0c314630f6af89677263233f3253ad847':
Disable fingerprint after force lock
2015-08-31 20:40:54 +00:00
Adrian Roos
7e1775d246
am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev
...
* commit '781953123e5b0f0f85691eabc13b3430c3054a10':
Disable fingerprint after force lock
2015-08-31 20:16:57 +00:00
Adrian Roos
781953123e
Merge "Disable fingerprint after force lock" into mnc-dr-dev
2015-08-31 20:04:46 +00:00
Adam Lesinski
f7ce28fad5
am d0ce1fbb: am 69e17f59: am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
...
* commit 'd0ce1fbbba497e9b5082c69d8da7260e85b0b579':
BatteryStats: Start using cpu power from kernel
2015-08-31 19:33:24 +00:00
Adam Lesinski
69e17f59f8
am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
...
* commit 'da43a3aacaba069e79f1dbfa491f6bc0b6f7fa95':
BatteryStats: Start using cpu power from kernel
2015-08-31 19:13:39 +00:00
Adam Lesinski
da43a3aaca
Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
2015-08-31 19:04:46 +00:00
Adrian Roos
0cb50efdc2
Disable fingerprint after force lock
...
Bug: 23275072
Change-Id: Icaeffaa1fa22a4a800ddf0f38105099557c74317
2015-08-28 23:54:43 +00:00
Ajay Panicker
53b1884ac6
am 30aa53c7: am 92fb5342: am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev
...
* commit '30aa53c7af22f98233a9c3acbe0efe20a569c8f1':
Add StateMachine.removeDeferredMessages()
2015-08-27 19:56:20 +00:00
Ajay Panicker
92fb534298
am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev
...
* commit 'c07701f2764a1c09dc3e8af4321ff0ef66056fee':
Add StateMachine.removeDeferredMessages()
2015-08-27 19:40:05 +00:00
Ajay Panicker
c07701f276
am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev
...
* commit '3e5b01185c08c46b80c395ca1f9c93e45cd98ba5':
Add StateMachine.removeDeferredMessages()
2015-08-27 19:33:31 +00:00
Yasuhiro Matsuda
1ab43d5978
Add trace code to system server.
...
- Add TRACE_TAG_SYSTEM_SERVER for tracing system server code.
- Add a few more tracing code to the code paths related to boot.
BUG: 21739901
BUG: 22207144
Change-Id: I08b424d2f83783f512c3818394099909cd55f327
2015-08-27 12:22:07 +09:00
Ajay Panicker
c211978650
Add StateMachine.removeDeferredMessages()
...
Bug: 23111466
Change-Id: Ifbb67d4eb080313af0968d5cb6b9508837e3458e
2015-08-26 19:34:52 -07:00
Selim Cinek
f193557530
am 42af140f: am 8f7a7e01: am a07177f0: Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev
...
* commit '42af140f4cee8b05c72fb43e7760ce8ebb8bcaf7':
Launching the camera now from systemUI including animations
2015-08-26 17:46:43 +00:00
Selim Cinek
8f7a7e0193
am a07177f0: Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev
...
* commit 'a07177f0ad362ab3e03029cf774e55579ea025cf':
Launching the camera now from systemUI including animations
2015-08-26 17:27:17 +00:00
Selim Cinek
a07177f0ad
Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev
2015-08-26 17:20:50 +00:00
Selim Cinek
372d1bdd54
Launching the camera now from systemUI including animations
...
The GestureLaunchService now informs systemUI that a launch
has been requested and the systemUI, depending on its state
will launch the Camera in the correct mode, including
animations.
Bug: 22957192
Bug: 22958025
Change-Id: I815437c8bd33638245ac61a750f64af74fe3e1e3
2015-08-26 10:12:06 -07:00
Adrian Roos
60aff469b2
am f90169d1: am 5bc2a2c0: am d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-dev
...
* commit 'f90169d12b9654630740cd649b177c3bd6685190':
Disable fingerprint after user lockout
2015-08-26 01:04:42 +00:00
Adrian Roos
5bc2a2c0ce
am d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-dev
...
* commit 'd56892da195b183bb5205a0c526bd730fb8a672f':
Disable fingerprint after user lockout
2015-08-26 00:51:02 +00:00
Adrian Roos
873010dfee
Disable fingerprint after user lockout
...
Bug: 22677859
Change-Id: I38b918d2e40b5bb423f2e5c171fe65bed8d440a6
2015-08-25 15:59:00 -07:00
Adrian Roos
bcc26c0201
am 69fd61cb: am a8bbebd4: am b5e47228: Add StrongAuthTracker
...
* commit '69fd61cb9a487e5993098c93113d86c4fb32c304':
Add StrongAuthTracker
2015-08-22 00:40:47 +00:00
Adrian Roos
a8bbebd426
am b5e47228: Add StrongAuthTracker
...
* commit 'b5e4722891e7bbf2fffcd995af02838667a3abab':
Add StrongAuthTracker
2015-08-22 00:16:48 +00:00
Adam Lesinski
ab7672d45a
BatteryStats: Start using cpu power from kernel
...
This allows us to stop using approximate methods of attributing
cpu frequency time across apps and to use a more precise kernel
method that is aware of the time spent by a process on a given core
at a given frequency.
Bug:22773176
Change-Id: I3c34365fa8c73204f178a5610423901b13453d06
2015-08-21 16:46:14 -07:00
Adrian Roos
b5e4722891
Add StrongAuthTracker
...
Bug: 22846469
Bug: 22115393
Change-Id: I6ef5322d02e540fc043e7f20d3aabf595ce7c224
2015-08-21 13:28:00 -07:00
