Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
211,601 Commits 3 Branches 0 Tags
ea1831d211ea0e6b2d161c714bb0786369ef2df5
Commit Graph

5165 Commits

Author SHA1 Message Date
Adam Lesinski
112c1dc63a am 6a8d1fd6: am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev 
* commit '6a8d1fd62f73a241e7962b3baa3720a6dcd0767b':
  Fix Array Index Out of Bounds in BatteryStatsImpl
 2015-09-22 18:58:50 +00:00
Andreas Gampe
5d7b68d491 am 53ed452e: am 9ce68b24: am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev 
* commit '53ed452e86aa186b5903b65057b4473629292f0d':
  Frameworks/base: Propagate boot status to installd
 2015-09-22 18:54:19 +00: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
Elliott Hughes
776fa57b2d am aa311698: am 0361b18e: Merge "WrapperInit: remove dead execStandalone method" 
* commit 'aa31169804dffa3b36654ccffe67a53f6ff4cdaf':
  WrapperInit: remove dead execStandalone method
 2015-09-22 15:50:09 +00:00
Elliott Hughes
aa31169804 am 0361b18e: Merge "WrapperInit: remove dead execStandalone method" 
* commit '0361b18ea10aa7987dbf8c4217d5f4c7e3a4a610':
  WrapperInit: remove dead execStandalone method
 2015-09-22 15:42:36 +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
Daniel Micay
13eac10a26 WrapperInit: remove dead execStandalone method 
This became dead with the removal of support for the non-runtime-init
code path in f48029f00a.

Change-Id: Id68e0da4658e83f0d3bfd8645152165faacac5fa
 2015-09-21 18:14:56 -04:00
Adam Lesinski
eb1356cc15 am 3bdbda78: am dd0238ec: am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev 
* commit '3bdbda780613e1701e4e3e567be8a743a8dedb8f':
  Fix crash when no power_profile is specified
 2015-09-19 00:23:02 +00: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
4092eeb7f7 am 069594f9: am 4e86aae6: am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev 
* commit '069594f96a3c70b01119f689f2195e0d933c0700':
  BatteryStats: Better big-little CPU accounting
 2015-09-18 21:02:27 +00: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
9546d5a2ec am 96c95ba5: am 5f22c0b2: am 1b67a6b8: Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev 
* commit '96c95ba59658708c3214b93ace4bb2835ac62863':
  Badge ChooserActivity choices with their app icon for disambig
 2015-09-18 16:52:21 +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
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
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
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