Commit Graph

6809 Commits

Author SHA1 Message Date
Mitchell Wills
81bf880226 Merge "Reenable the unit tests for StateMachine" 2016-08-10 16:53:24 +00:00
Jorim Jaggi
e01daeb9e2 Fix navigation bar in seascape in BackdropFrameRenderer am: 9a7d0a5f84 am: cbd845adff
am: ba926070ac

Change-Id: I82863f7c907c36ec852a444d5e418022dfa4304f
2016-08-09 21:48:41 +00:00
Jorim Jaggi
ba926070ac Fix navigation bar in seascape in BackdropFrameRenderer am: 9a7d0a5f84
am: cbd845adff

Change-Id: I21133f8441ec3ba6ef6a664dd382570ab95f9a1e
2016-08-09 21:42:25 +00:00
Mitchell Wills
36afe5b5cc Reenable the unit tests for StateMachine
In order to make the tests run a few methods must be made public so that
they can be called from a class loaded by a different class loader.

Fixed: 28217358
Change-Id: I98ce1e952a78528ae6ebd3a0e843c9ddfe937337
2016-08-09 13:35:46 -07:00
Jorim Jaggi
9a7d0a5f84 Fix navigation bar in seascape in BackdropFrameRenderer
Change-Id: I922aaf835011b236f4b4d34f249304e335c3318b
Fixes: 30670517
2016-08-09 13:47:20 +02:00
Tobias Thierer
4ebf60b7cf Merge "Ensure apps cannot prevent uncaught exceptions being logged." am: f61a449ee9 am: 8431c55fb8 am: 62360649c8
am: 1c47ebcf84

Change-Id: I7dce05184017dc221f021423acb4215de0a157f4
2016-08-09 09:18:25 +00:00
Tobias Thierer
1c47ebcf84 Merge "Ensure apps cannot prevent uncaught exceptions being logged." am: f61a449ee9 am: 8431c55fb8
am: 62360649c8

Change-Id: I5ab8894481e32ee2c4f40439d920facd095ac952
2016-08-09 09:12:51 +00:00
Tobias Thierer
8431c55fb8 Merge "Ensure apps cannot prevent uncaught exceptions being logged."
am: f61a449ee9

Change-Id: I826c175547a73123cd438ebe6991efee39a433d0
2016-08-09 09:02:27 +00:00
Joe Onorato
0c3de60035 Have BatteryStats track and report the running wakelocks. am: adbee556a9
am: d55f7e646f

Change-Id: I27a7fea00398a717ae28be0dab89ab9c242aa419
2016-08-08 20:13:00 +00:00
Evan Rosky
1839645126 Add support for custom user-switch UI
Given config_customUserSwitchUi, AM/UserController will not show any
UI during user-switch (no dialog or screen-freeze).

Provides a mechanism (WM.setSwitchingUser) by which a custom user-switch
UI can notify WM/Keyguard when it expects a user-switch operation to
be running.

Bug: 29329555
Change-Id: Ic903fc251d7ec3a54bc6a77906d3afa45a6a5fac
2016-08-08 10:22:25 -07:00
Tobias Thierer
addbf9015a Ensure apps cannot prevent uncaught exceptions being logged.
Let RuntimeInit use an UncaughtExceptionPreHandler to log an exception
rather than relying on UncaughtHandler, which apps can replace. This
makes it easier to diagnose application death, especially during app
compatibility testing for a new version of Android.

Test: Verified manually, with the help of a small sample app (not
checked in), that stacktraces for RuntimeExceptions thrown on main
or background threads are logged even when the app set a default
UncaughtExceptionHandler that swallows the exception with no action.

Note that such an inappropriate UncaughtExceptionHandler will still
cause threads to die without the app being killed, which it should be.
In an exception then happens on the main thread, the app will freeze
until the ANR dialog kicks in after a few seconds. I have manually
verified that this behavior is unchanged from before this CL.

No new integration tests are included because the default system
behavior has not changed.

Bug: 29624607
Change-Id: Ie87377b0bcadc3ba4083a8ab1bedb8f3dd95a4bd
2016-08-08 17:59:28 +01:00
Joe Onorato
adbee556a9 Have BatteryStats track and report the running wakelocks.
The times reported are in the screen off / on battery time base.

Bug: 29546924
Change-Id: I025b2959becb256a26cf531e944786d4e9a59149
2016-08-05 16:10:13 -07:00
Adrian Roos
92c9c4f3e6 Keyguard: Refactoring for improving trusted unlock while occluded am: d88eb2693b am: cb5642afae
am: bfe5166ac3

Change-Id: I760b5f4d780231b06ec8ef733a8a002c3dd2420d
2016-08-05 21:19:30 +00:00
Adrian Roos
bfe5166ac3 Keyguard: Refactoring for improving trusted unlock while occluded am: d88eb2693b
am: cb5642afae

Change-Id: Id60ae0e1bfcfb2297855810781d8ca040cf46def
2016-08-05 18:53:14 +00:00
Adrian Roos
cb5642afae Keyguard: Refactoring for improving trusted unlock while occluded
am: d88eb2693b

Change-Id: I91f6bfe7a0573ad31785c5a3d1bff03a24d1107c
2016-08-05 18:45:41 +00:00
Adrian Roos
c49dfaf4d6 Merge changes from topic 'smooth_unlock' into nyc-mr1-dev
* changes:
  Keyguard: Improve trusted unlock while occluded
  Keyguard: Refactoring for improving trusted unlock while occluded
2016-08-05 18:37:29 +00:00
Todd Kennedy
8d69e9c93b Move EphemeralResolverService am: 31b95e0265 am: fa67fad84e
am: 8c073e0aad

Change-Id: I2fb2add1e4431c2c802430990f99807934878e84
2016-08-05 17:58:25 +00:00
Todd Kennedy
8c073e0aad Move EphemeralResolverService am: 31b95e0265
am: fa67fad84e

Change-Id: Ieabd373b5557e03c6a189f070c8f79998e7a5a0a
2016-08-05 17:52:00 +00:00
Todd Kennedy
fa67fad84e Move EphemeralResolverService
am: 31b95e0265

Change-Id: I16533b342433fc1042e0d78e1be8e43a431031a6
2016-08-05 17:47:17 +00:00
TreeHugger Robot
9d9621f472 Merge "Move EphemeralResolverService" into nyc-mr1-dev 2016-08-05 17:37:35 +00:00
Todd Kennedy
31b95e0265 Move EphemeralResolverService
It should not have been under com.android.internal

Fixes: 30673742
Change-Id: I2277aa4a4799fa59bf68af7c4cfcb4e1216aeb8d
2016-08-05 07:17:52 -07:00
Adrian Roos
d88eb2693b Keyguard: Refactoring for improving trusted unlock while occluded
- Adds a trusted signal from Keyguard to PhoneWindowManager
- Allows PhoneWindowManager to exempt DISMISS_KEYGUARD windows from force hiding
- Allows PhoneWindowManager to dismiss Keyguard while occluded

Bug: 27410215
Change-Id: I3ad490b64a5805b6f3888a9f37fcfbdd0116395e
2016-08-05 00:04:07 +00:00
John Stultz
40dcffe7ac Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms" am: 1085be0ce3 am: 5e23ab394a am: 55b3a9ceb3
am: 15cb51e04a

Change-Id: Ia4fbf6264a6ee6806b1c44d00249ce74b5999f3b
2016-08-03 19:52:27 +00:00
Tobias Thierer
258a554f62 Merge "Stop profiling on uncaught exception." 2016-08-03 10:42:37 +00:00
TreeHugger Robot
ed2e7c894e Merge "Have BatteryStats track and report the running wakelocks." 2016-08-03 01:49:50 +00:00
Joe Onorato
92fd23fc62 Have BatteryStats track and report the running wakelocks.
The times reported are in the screen off / on battery time base.

Bug: 29546924
Change-Id: I025b2959becb256a26cf531e944786d4e9a59149
2016-08-02 17:27:01 -07:00
John Stultz
15cb51e04a Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms" am: 1085be0ce3 am: 5e23ab394a
am: 55b3a9ceb3

Change-Id: Iaf49bda287e258e54ebf72ef1837dfb5f528eecc
2016-08-03 00:23:36 +00:00
John Stultz
5e23ab394a Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms"
am: 1085be0ce3

Change-Id: I23d7c2af33db8621b0c3b3415669543e0e3b740f
2016-08-03 00:12:32 +00:00
Tobias Thierer
8ad86a3d1a Stop profiling on uncaught exception.
When "handling" an uncaught exception, make an attempt to stop
profiling. In case profiling was active, this will avoid losing
the profiling buffer.

This change is required as a base in order for
https://android-review.googlesource.com/#/c/249721/
to merge cleanly.

(Cherry picked from commit 4c79fea9ef)
Bug: 26291225
Change-Id: I35f352e5f28eafe4702da9eae587c3b65c360b3a
2016-08-02 17:32:39 +01:00
Dianne Hackborn
cc30b55159 Work on issue #30407061: OverflowArrayMap.stopObject unable to find object am: 657153bd28 am: ae7bdd8dde
am: 347c006732

Change-Id: Ib69b728931b30b2092becb89d55a46b92245a0fc
2016-07-31 03:46:08 +00:00
Dianne Hackborn
347c006732 Work on issue #30407061: OverflowArrayMap.stopObject unable to find object am: 657153bd28
am: ae7bdd8dde

Change-Id: Id9a3dfa2e18f62b2dc35396ae34ffb450ef8cbdc
2016-07-30 22:27:22 +00:00
Dianne Hackborn
ae7bdd8dde Work on issue #30407061: OverflowArrayMap.stopObject unable to find object
am: 657153bd28

Change-Id: Icf5ac1ea479e098f18972111e44724698086a255
2016-07-30 06:41:23 +00:00
Dianne Hackborn
29cc1b6939 Merge "Work on issue #30407061: OverflowArrayMap.stopObject unable to find object" into nyc-mr1-dev 2016-07-30 00:03:39 +00:00
Dianne Hackborn
657153bd28 Work on issue #30407061: OverflowArrayMap.stopObject unable to find object
Add more debug info when this happens to try to better
understand what is going on.

Change-Id: Id8c979d1c2d3769ce68156fb7e69d5ff9d5ded1c
2016-07-29 14:54:14 -07:00
Chong Zhang
237ee66bd9 Merge \\\"Cleanup mAnimatingExit flag before maybeUpdateTransitToWallpaper()\\\" into nyc-mr1-dev am: f84d9f91ce am: 68a518c49a
am: 5d0649a35e

Change-Id: I2ce986ce8e998c9a63bb1ac743ed9bcdfe754c4e
2016-07-29 00:33:50 +00:00
John Stultz
5733f387be Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms
The when the timerfd alarm logic was added to the kernel, an oversight was made
and the interface does not check for the CAP_WAKE_ALARM permissions as required
via other kernel methods to trigger an alarm timer.

In v4.8-rc kernels, the change 2895a5e5b3a ("timerfd: Reject ALARM timerfds
without CAP_WAKE_ALARM") was added by Eric Caruso <ejcaruso@google.com>.

After this change (which may be backported to -stable), the AlarmManager will
fail on the first timerfd_create call, and will not be able to set the time
or handle other necessary functions.

The solution here is to add CAP_WAKE_ALARM to the system_server process.

Change-Id: Ifdb16f3ef42711e553f727165de3922d484b5be4
Signed-off-by: John Stultz <john.stultz@linaro.org>
2016-07-28 12:41:04 -07:00
Adam Lesinski
387c351d5a DO NOT MERGE Change KernelUidCpuTimeReader Slog.wtf to Slog.e am: 82a4d6f93b
am: 52d7fd62a4

Change-Id: I3b5febe3ecbd2ebead013273f5fe867376e2b756
2016-07-28 19:40:59 +00:00
Adam Lesinski
52d7fd62a4 DO NOT MERGE Change KernelUidCpuTimeReader Slog.wtf to Slog.e
am: 82a4d6f93b

Change-Id: I5e3b406b7a3f9a7f367dccaed0094ab5b7a78d2e
2016-07-28 19:23:16 +00:00
Adam Lesinski
533159b4f9 Merge "DO NOT MERGE Change KernelUidCpuTimeReader Slog.wtf to Slog.e" into nyc-mr1-dev 2016-07-28 19:08:30 +00:00
Adam Lesinski
82a4d6f93b DO NOT MERGE Change KernelUidCpuTimeReader Slog.wtf to Slog.e
There is a known issue in the kernel uidcputime module that triggers
the WTF, which has a cost to the system. Convert to a regular log
instead.

Bug:28950306
Change-Id: I7cbb3138f644075f0d9d65ce8b52bd835eb270fd
2016-07-28 19:08:04 +00:00
Chris Banes
19ce4ad1f6 Fix CascadingMenuPopup width if background has padding DO NOT MERGE am: f9e2c1b326
am: be3daf6947

Change-Id: I30624b96a74b5fb1928ada59e8f2a1968ef04426
2016-07-28 08:53:37 +00:00
Chris Banes
be3daf6947 Fix CascadingMenuPopup width if background has padding DO NOT MERGE
am: f9e2c1b326

Change-Id: I1997cde48524dc5c040311f4f9e7824485b55c7d
2016-07-28 08:47:15 +00:00
Chris Banes
7f37f2693f Merge "Fix CascadingMenuPopup width if background has padding DO NOT MERGE" into nyc-mr1-dev 2016-07-28 08:38:40 +00:00
James Carr
d2a4944d68 Merge "Calculate and account for memory power use" 2016-07-27 23:24:55 +00:00
Andrii Kulian
5d0649a35e Don\\'t delay child pressed state in freeform mode am: a6aea9876e
am: 5b637aed1c

Change-Id: If94ef4d5fbf5142044797722bc0ffa86d0aa0dc4
2016-07-27 22:52:24 +00:00
Andrii Kulian
5b637aed1c Don\'t delay child pressed state in freeform mode
am: a6aea9876e

Change-Id: I68c9d42ca9b3bda6a2ea823db27f8a11046b0e50
2016-07-27 22:01:07 +00:00
James Carr
2dd7e5e3ef Calculate and account for memory power use
Use PowerProfile to calculate mAh (MemoryPowerCalculator), and
involve this calculation in the overall accounting of battery
for when the phone is unplugged from a charger.

Note: Depends on ag/1196281

Change-Id: Id02bef19c9b250c614df0a6c88711b486faaef46
2016-07-27 14:50:23 -07:00
Jeff Davidson
2862ed2541 Add support for carrier \\"associated\\" apps. am: 24b9d96007
am: 19af77d2cb

Change-Id: I089db772e37b7d07a5423793aced78f2b3a9a1ae
2016-07-27 21:40:17 +00:00
Andrii Kulian
671bc2052a Merge "Don't delay child pressed state in freeform mode" into nyc-mr1-dev 2016-07-27 21:29:46 +00:00
Jeff Davidson
19af77d2cb Add support for carrier \"associated\" apps.
am: 24b9d96007

Change-Id: I1de92977f3a0635d88e6517210f6bbb06ab3d0f0
2016-07-27 21:18:07 +00:00