Commit Graph

4707 Commits

Author SHA1 Message Date
Jorim Jaggi
b7b9b31f69 am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit 'ad26dc5f15d6ac13741ad8724c25ef8c58e73e81':
  Deliver camera launch source for analytics
2015-09-25 01:30:43 +00:00
Jorim Jaggi
40aa8811bc Deliver camera launch source for analytics
Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
2015-09-24 16:32:09 -07:00
Adam Lesinski
dbca76cda1 am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
* commit '1b57758a1bb814c3a00ec864fe164bfe7861a9ab':
  Fix Array Index Out of Bounds in BatteryStatsImpl
2015-09-22 18:42:33 +00:00
Andreas Gampe
9ce68b2444 am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
* commit 'b49245f96233b7f89fb5d4ba52576131ca6fb47a':
  Frameworks/base: Propagate boot status to installd
2015-09-22 18:36:43 +00:00
Adam Lesinski
1b57758a1b Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev 2015-09-22 18:33:14 +00:00
Adam Lesinski
52290c9c4f Fix Array Index Out of Bounds in BatteryStatsImpl
If the power profile was not set yet, the default sizes of
cpu freq arrays could have been too small.

Bug:24244089
Change-Id: Ic17a1e8f2058c51fbdda14db35b7b62f4880be00
2015-09-21 17:38:52 -07:00
Andreas Gampe
06bb908b78 Frameworks/base: Propagate boot status to installd
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.

Bug: 23898216
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
2015-09-21 15:16:13 -07:00
Adam Lesinski
dd0238ec7d am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
* commit 'e54253bdd317cbe806225081ad9ebe64f2b50b9a':
  Fix crash when no power_profile is specified
2015-09-18 22:21:31 +00:00
Adam Lesinski
e54253bdd3 Merge "Fix crash when no power_profile is specified" into mnc-dr-dev 2015-09-18 22:15:19 +00:00
Adam Lesinski
8057133d49 Fix crash when no power_profile is specified
Always connected devices don't have power_profiles,
so handle the case where the default cpu speed count of
1 is used on a device with more cpu speeds.

Bug:23776983
Change-Id: Ifdddad2f28eea5b730833622a6b6043b3086efd2
2015-09-18 14:56:34 -07:00
Adam Lesinski
4e86aae667 am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
* commit '680553957e4ff47343334881c34de6969b2ed977':
  BatteryStats: Better big-little CPU accounting
2015-09-18 20:38:02 +00:00
Adam Lesinski
680553957e Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev 2015-09-18 20:26:07 +00:00
Adam Powell
5f22c0b27a am 1b67a6b8: Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev
* commit '1b67a6b84d133e1fdac352d0821034ceca739a71':
  Badge ChooserActivity choices with their app icon for disambig
2015-09-18 16:33:57 +00:00
Adam Powell
00f4aad704 Badge ChooserActivity choices with their app icon for disambig
When two or more activities with the same user-visible label are
shown, we have traditionally shown the app name or package name if the
app names also match. This was to help the user tell the difference
between multiple apps publishing similar activities and avoid
unintentionally starting the wrong one. However, in the case of
explicit choosers (e.g. ACTION_SEND sharing) a few common collisions
occur in practice and falling all the way back to package name isn't
very helpful.

Instead, we now assume that the app icon, which the user has seen
before at install time, is unique enough on its own to disambiguate
these cases and avoid user confusion. We no longer show the app name
or package name as secondary text in the chooser.

In cases where an activity has a different icon from its containing
app, we now badge the activity icon with the app icon so that the user
knows which app a potentially ambiguous choice belongs to.

Bug 24113937

Change-Id: Ie54fbf77bfcc86e50768f93be2be0e53cf2ce7b5
2015-09-17 20:56:00 +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
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
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
Adam Lesinski
6832f39416 BatteryStats: Better big-little CPU accounting
Generalize cpu clusters so we can measure frequency
and power usage across heterogeneous cpu clusters.

This also brings back reading of cpu-times for power calculation.

Bug:22773176
Change-Id: I9c794ae9756c782c0e971c7f5fcebbe70374b269
2015-09-09 17:07:54 -07: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.

Change-Id: I40251500b2dcf95e63ce39a768e11a50b26fb923
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
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
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
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
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
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
Ajay Panicker
c211978650 Add StateMachine.removeDeferredMessages()
Bug: 23111466
Change-Id: Ifbb67d4eb080313af0968d5cb6b9508837e3458e
2015-08-26 19:34:52 -07: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
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
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
Dianne Hackborn
aa8c876e1d am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
* commit '5c577bab3b4cd9bf74a09368be5d73aed627f6a5':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
2015-08-19 18:39:56 +00:00
Dianne Hackborn
5c577bab3b am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
* commit '29cd880890825ce15a1b2da977bcb1796db6f4e3':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
2015-08-19 18:31:20 +00:00
Dianne Hackborn
865b79b43b Fix issue #23326715: Clarify --checkin/-c options in batterystats
Change-Id: I3f026447ba7c6d2c3f9ef065269c31a78cf73512
2015-08-18 17:33:00 -07:00