Commit Graph

6810 Commits

Author SHA1 Message Date
Glenn Kasten
d21cb15584 resolve merge conflicts of c76a3ac to stage-aosp-master am: 67ffd5e617
am: f7b4fd24e3

Change-Id: Ib06db403955ae0056c1fee0e09f9249d0b887ea1
2016-08-17 21:10:59 +00:00
Glenn Kasten
67ffd5e617 resolve merge conflicts of c76a3ac to stage-aosp-master
Change-Id: Ifff16bdc42e8326f3f60cf4b92688c445cb4db25
2016-08-17 13:28:04 -07:00
Jorim Jaggi
9322632f6a Fix a flicker when returning to the lockscreen am: d11d1a9486
am: afaf4ac7a9

Change-Id: I26eb19aba2c68fea5faa82bf1e41286b8999bf4a
2016-08-17 18:54:20 +00:00
Jorim Jaggi
afaf4ac7a9 Fix a flicker when returning to the lockscreen
am: d11d1a9486

Change-Id: Ia0b617be2bb00db24115f04f362cd072d59ebe71
2016-08-17 18:28:59 +00:00
Chong Zhang
9391bc557c Add new window type TYPE_DRAWN_APPLICATION am: fea963edee
am: 5e09ceb641

Change-Id: I955b985c47ca10a17dec6921af0277d1d6a7431d
2016-08-17 18:22:10 +00:00
Jorim Jaggi
d11d1a9486 Fix a flicker when returning to the lockscreen
If we return to the lockscreen from a FLAG_SHOW_WHEN_LOCKED activity,
there was an additional black flicker as the wallpaper wasn't shown
for a couple of frames. The issue is that we didn't set the wallpaper
flag again, to fix another flicker with lockscreen wallpapers. Now,
we pass the state whether we currently have a lockscreen wallpaper
and if we don't have one, we immediately set the wallpaper flag
again.

Bug: 30829255
Bug: 30883413
Change-Id: I9faeaa77b98eb02058171ce19cf90b43826ebe9e
2016-08-17 18:10:54 +00:00
Michael Kwan
9019052e96 Hide space for title if the title is GONE.
am: 790a34e1a9

Change-Id: I515514013819133228f3185166fe7962ab2f27c8
2016-08-17 17:48:32 +00:00
Chong Zhang
5e09ceb641 Add new window type TYPE_DRAWN_APPLICATION
am: fea963edee

Change-Id: If7acf1349b87d4be88a9b4f9fbd984bbd4aca8ad
2016-08-17 17:16:18 +00:00
Glenn Kasten
1fda533936 Squashed commit of the following:
commit efa6f355b06675aa4d0879fd279e22c16d5c046c
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Wed Aug 10 12:25:13 2016 -0700

    MIDI: Use server-side socket in blocking mode for virtual devices

    Since virtual MIDI servers may misbehave, blocking mode will throttle
    them if clients are not coping with their sending speed.

    Bug: 29413812
    Change-Id: I9c4a2a7a7ea3ea060c93fedc7d0f033427c557c9

commit 755dfb5f83749d3963c63d98d692307f8271c804
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Fri Jul 8 13:26:19 2016 -0700

    Protect MIDI framework against client blocks in MidiReceiver.onSend

    Make the server-side socket non-blocking when creating MidiOutputPort
    for clients. Thus if a client ceases to read from its side of the
    socket pair, the server will just fail to write instead of blocking.

    One drawback is that the MidiOutputPort on the client can't indicate
    that it has become dysfunctional, but it's not possible without
    changing the API.

    Bug: 29413812
    Change-Id: I9dfcbdd214a815cea8fd1365324fd78ca459268a

commit c740b13953761f58233ac651a0b5227733b1bdcc
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Fri Jun 17 04:11:25 2016 -0700

    UsbMidiDevice: Clean up terminology and fix comments

    When working with physical MIDI devices, an *input* stream is used
    for reading from *output* port of the device, and vice versa. Thus,
    using "input" and "output" without specifying whether it's a stream
    or a port is confusing.

    Clarify names of counter variables, and fix a couple of comments
    that were incorrect due to this confusion. No functional changes.

    Change-Id: If561eaca4bade94e9296d2c703c9fcebc91296e2

commit 4269c6417287737624f6165a8bbeb5aa427de9a0
Author: Glenn Kasten <gkasten@google.com>
Date:   Thu May 5 18:49:16 2016 -0700

    Update MIDI package summary

    Bug: 28625060
    Change-Id: If552ca8e1a0666d402b5f536699bf3fb09c1e324

commit 862d40b73168bde7d0be5280d997985c18061014
Author: Phil Burk <philburk@google.com>
Date:   Tue Apr 19 15:56:24 2016 -0700

    MidiDevice: do not open ports on closed device

    Fix involves client side mIsDeviceClosed flag.

    Bug: 24949216
    Change-Id: I666284a787fbb9a710d2372fb424e8e54f6a2825
    Signed-off-by: Phil Burk <philburk@google.com>

commit 6f1de358b9f2616e03f4655f01454770915ddd66
Author: Phil Burk <philburk@google.com>
Date:   Mon Apr 18 16:05:28 2016 -0700

    MidiService: fix resource leak

    The proxy object was being used to match when adding or removing objects.
    But they are different each time. So now we use an asBinder() object.

    Bug: 28153736
    Change-Id: I1bccebf1e9464668db757ff08b41902d0cf0e3a7
    Signed-off-by: Phil Burk <philburk@google.com>

commit f7386bd535bb8a1d7f8df8f44a1748ab770c991a
Author: Phil Burk <philburk@google.com>
Date:   Tue Apr 5 14:19:53 2016 -0700

    MidiDevice: fix connectPorts for same Process

    If connectPorts() was called for a device in the same process then
    the connection would die when the ParcelFileDescriptor was closed.

    Bug: 26406775
    Change-Id: Id0538452593b4761ac2a93d366ade76d2e35ce73
    Signed-off-by: Phil Burk <philburk@google.com>

Change-Id: I4dfc2a2cbaf04bf1a790ae2cb39bf74fb5bb16ac
2016-08-17 08:45:39 -07:00
Michael Kwan
dc0735676b Merge "Hide space for title if the title is GONE." into cw-f-dev 2016-08-16 17:56:42 +00:00
Chong Zhang
fea963edee Add new window type TYPE_DRAWN_APPLICATION
This type behaves like a normal TYPE_APPLICATION, except that WM
will always wait for it to be drawn before starting a transition.

WM always waits for TYPE_BASE_APPLICATION (main window), but for
TYPE_APPLICATION, it only waits if the window relayouts to visible
and gets a surface before the main window is drawn. If main window
itself is ready very fast, transition could start without the other
window.

bug: 30830849
Change-Id: Ife71a9812db7c8eba6ee4ead10ce4f31d9e93b40
2016-08-15 17:36:40 -07:00
Adam Lesinski
4e4e50cd02 SamplingTimer: Fix issue with summary recording too much am: 9edd6be542
am: e5852eb501

Change-Id: Ie4ab1a86f0c28a41ed84e861c83d38bf1a90a4c8
2016-08-13 00:59:35 +00:00
Adam Lesinski
e5852eb501 SamplingTimer: Fix issue with summary recording too much
am: 9edd6be542

Change-Id: Id423f0343c2d435281d47cd6edacb6816baaace8
2016-08-13 00:52:03 +00:00
TreeHugger Robot
8aacc3cf98 Merge "SamplingTimer: Fix issue with summary recording too much" into nyc-mr1-dev 2016-08-13 00:40:53 +00:00
Adrian Roos
ae96089711 Assist: Allow disabling the disclosure animation am: 2335bd6787
am: 57d1601849

Change-Id: I5954913f4f210e47d5e3a297f25d3f646cdd2a4b
2016-08-12 23:16:53 +00:00
Adam Lesinski
9edd6be542 SamplingTimer: Fix issue with summary recording too much
The summary is supposed to just hold enough data to continue counting
once the device has reset. Since kernel stats reset when the device
resets, and the first update is ignored to account for soft resets where the
kernel continues running, SamplingTimer should not be recording the last value
it saw from /proc/wakelocks in the summary.

Bug:30575302
Change-Id: Ic193bc5af9a0ede514e3abc8146523d7316c47d3
2016-08-12 15:49:44 -07:00
Adrian Roos
57d1601849 Assist: Allow disabling the disclosure animation
am: 2335bd6787

Change-Id: I2a88e088da3062b7bd10581650de526629973c67
2016-08-12 20:35:22 +00:00
TreeHugger Robot
1ee928a62a Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev 2016-08-12 20:28:12 +00:00
Adrian Roos
2335bd6787 Assist: Allow disabling the disclosure animation
Change-Id: I6e7ed00f066fda7cc268119e7aa4133010aa69c1
Fixes: 30809067
2016-08-12 12:04:53 -07:00
Michael Kwan
790a34e1a9 Hide space for title if the title is GONE.
Bug: 30676030
Change-Id: I5e61d00dadbfffbc7b04ee3431f591e9d2d2ce29
2016-08-12 11:10:58 -07:00
Phil Weaver
99633b3700 Don't preserve a11y focus in hierarchy state. am: f40ee509c6
am: 711d7260ba

Change-Id: I7b2f1b2955c279f21f8f7a5ffc7b615ddaa50ff5
2016-08-11 21:03:19 +00:00
Phil Weaver
711d7260ba Don't preserve a11y focus in hierarchy state.
am: f40ee509c6

Change-Id: I14ba7354058eef6942286483b3f61ea0404135ea
2016-08-11 20:53:37 +00:00
Phil Weaver
aefa892035 Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev 2016-08-11 20:34:42 +00:00
Adrian Roos
bbf52f2e85 Only disable trust agents after lockout am: 9d6fc9246b
am: 73b2f5981e

Change-Id: Idec9662345a8ed9f75605d1b5dd39f04ef488389
2016-08-11 02:44:42 +00:00
Adrian Roos
73b2f5981e Only disable trust agents after lockout
am: 9d6fc9246b

Change-Id: I1fd7860a5a2c452e4b3c2e3e8d1073c423c9f054
2016-08-11 02:38:45 +00:00
TreeHugger Robot
f6487b63a1 Merge "Only disable trust agents after lockout" into nyc-mr1-dev 2016-08-11 02:30:32 +00:00
Andreas Gampe
0d42671cc5 Zygote: allow system server compilation to fail am: e7bc152c20
am: 8253782f5b

Change-Id: I1fc916e9db2e391975b0037853cbfda9b08c706a
2016-08-11 02:16:12 +00:00
Andreas Gampe
8253782f5b Zygote: allow system server compilation to fail
am: e7bc152c20

Change-Id: Ibaea0c9bc3a5eb0e8a64342e4e27b7cfca21c647
2016-08-11 02:11:21 +00:00
TreeHugger Robot
927db408a2 Merge "Zygote: allow system server compilation to fail" into nyc-mr1-dev 2016-08-11 02:02:09 +00:00
Adrian Roos
9d6fc9246b Only disable trust agents after lockout
Previously trust agents would be disabled even after one
wrong attempt. Now we wait for the cooldown (usually 5 attempts),
the same as fingerprint.

Also adds a TrustArchive entry of when device policy changes are sent to
trust agents.

Bug: 30037948
Change-Id: I9e284d994ddae45ef66b5b8b601297c63d8ba667
2016-08-10 18:01:32 -07:00
Andreas Gampe
e7bc152c20 Zygote: allow system server compilation to fail
Do not terminate when the system server classpath cannot be
compiled. This can be the case in fallback mode, e.g., when
a device ran out of space.

Bug: 30765660
Change-Id: I3aca3f2f789e2201e4019e1bf04d239ab54b0d3d
2016-08-10 11:46:14 -07:00
Adrian Roos
425ade9ef0 Notification: Reuse drawable in Header if Icon unchanged am: c4337a3569
am: dd33f36fc4

Change-Id: Ia24b71281669458d544ea34cb643265610ef020a
2016-08-10 17:12:38 +00:00
Adrian Roos
dd33f36fc4 Notification: Reuse drawable in Header if Icon unchanged
am: c4337a3569

Change-Id: I8e7da247e9b4d9a9acd46c29ca29d34409bb9453
2016-08-10 17:06:17 +00:00
Adrian Roos
d4a95806ab Merge "Notification: Reuse drawable in Header if Icon unchanged" into nyc-mr1-dev 2016-08-10 16:52:15 +00:00
Phil Weaver
f40ee509c6 Don't preserve a11y focus in hierarchy state.
This change rolls back functionality added in ag/747748.
The idea was to restore accessibility focus on
configuration changes, but the restoration was happening
too early, which caused ViewRootImpl and the View to
disagree about accessibility focus. This confusion makes
some views unreachable by swiping after a configuration
change.

Bug: 30042251
Change-Id: Iae32b5425a1e7de9a8f5be965feb912fd2d9a0bb
2016-08-09 16:33:30 -07: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
Adrian Roos
c4337a3569 Notification: Reuse drawable in Header if Icon unchanged
Mitigates an issue where a LevelListDrawable would constantly
be reloaded even if unchanged. To avoid this, small icons are
now only reloaded if they no longer point to the same resource.

Note that StatusBarIconView already has this logic.

Change-Id: I6be436e5cef7b7ca91a28edc413b1aaa0f1007d5
Fixes: 30496073
2016-08-09 12:31:20 -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
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
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
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
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