OSDN Git Service
Julia Reynolds [Tue, 26 Apr 2016 15:31:08 +0000 (15:31 +0000)]
Merge "Swap star tint." into nyc-dev
am:
efb951d
* commit '
efb951d4fefb004b94c0e3f9b3d8fab83b8803ca':
Swap star tint.
Change-Id: I2c05cd4c3ca4954114c68abe9baaae19a33f75c3
Andreas Gampe [Tue, 26 Apr 2016 15:31:06 +0000 (15:31 +0000)]
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev
am:
396c590
* commit '
396c590c423682af398f52a62e3d6f6fb2166d4e':
Frameworks/base: Make debug helper lazy in ConnectivityManager
Change-Id: I0df3657ea24f7ee9d360c0a56b12e94b2b883ca5
Julia Reynolds [Tue, 26 Apr 2016 15:26:26 +0000 (15:26 +0000)]
Merge "Swap star tint." into nyc-dev
TreeHugger Robot [Tue, 26 Apr 2016 15:25:43 +0000 (15:25 +0000)]
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev
Julia Reynolds [Tue, 26 Apr 2016 13:17:08 +0000 (09:17 -0400)]
Swap star tint.
Bug:
27558254
Change-Id: Ia72cdc89d4cdcf3f5a5210f14632c15271922a98
David Brazdil [Tue, 26 Apr 2016 12:27:25 +0000 (12:27 +0000)]
Merge "Change app selection policy for post-OTA verification" into nyc-dev
am:
3eaf72d
* commit '
3eaf72dc67ef0911bee0cc0d1db088cb70b044ca':
Change app selection policy for post-OTA verification
Change-Id: If87329113bde151ee9c459b15c31acc25fc011c1
David Brazdil [Tue, 26 Apr 2016 12:22:14 +0000 (12:22 +0000)]
Merge "Change app selection policy for post-OTA verification" into nyc-dev
Narayan Kamath [Tue, 26 Apr 2016 12:18:50 +0000 (12:18 +0000)]
LoadedApk: Don\'t set up JIT profile support inside the system_server.
am:
2d4a222
* commit '
2d4a222de157c693b16ca2b35a264dd92ae6abee':
LoadedApk: Don't set up JIT profile support inside the system_server.
Change-Id: I151d57ae8d31a7c7a9e8cccab847be6c11ad34ce
Narayan Kamath [Mon, 25 Apr 2016 18:16:56 +0000 (19:16 +0100)]
LoadedApk: Don't set up JIT profile support inside the system_server.
We shouldn't profile *any* packages loaded by the system_server, not
just the system_servers own ("android") package.
bug:
28241500
Change-Id: I5f3f477b40c758030a5bdc8e97d17cab6e68e204
David Brazdil [Mon, 18 Apr 2016 13:08:52 +0000 (14:08 +0100)]
Change app selection policy for post-OTA verification
Changes the policy for selecting packages which will be pre-verified
during post-OTA boot animation.
For Nx to Ny, an app is pre-verified if used in the foreground in the
last 7 days, or if its APK was loaded by other apps.
For M to N (or early N builds without detailed stats), an app is
pre-verified if it has any recorded use in the last 7 days.
Bug:
27902702
Bug:
27350503
Change-Id: I2b38daf017ecd0e5aa5ed596ed9351cffa03dbcb
David Brazdil [Tue, 26 Apr 2016 11:45:43 +0000 (11:45 +0000)]
Merge "Enable profile merging for post-OTA package verification" into nyc-dev
am:
5bc7f5f
* commit '
5bc7f5f01bb1dc25e0f1b965afb88d34f0e69890':
Enable profile merging for post-OTA package verification
Change-Id: I6ffbc0091110a8fc501c98470235c709da6c86bd
David Brazdil [Tue, 26 Apr 2016 11:39:41 +0000 (11:39 +0000)]
Merge "Enable profile merging for post-OTA package verification" into nyc-dev
David Brazdil [Tue, 26 Apr 2016 09:18:04 +0000 (10:18 +0100)]
Enable profile merging for post-OTA package verification
Currently post-OTA verification will attempt to compile with
'verify-profile' but does not merge the profiles prior to calling
dex2oat. As a result, we may miss some or all classes that need
verification.
Bug:
27688727
Change-Id: I1aa93cad2686513594cb37f6d3d181ae5c718d1d
Hui Shu [Tue, 26 Apr 2016 09:35:34 +0000 (09:35 +0000)]
Merge "WebView downgrade prevention logic" into nyc-dev
am:
e12d62b
* commit '
e12d62bd79d27f1719ac6db01b1dd53289fe03d4':
WebView downgrade prevention logic
Change-Id: I1992cd40caec3271a3ed706cb4c511b4bec2c59b
TreeHugger Robot [Tue, 26 Apr 2016 09:31:55 +0000 (09:31 +0000)]
Merge "WebView downgrade prevention logic" into nyc-dev
Shreyas Basarge [Tue, 26 Apr 2016 09:27:00 +0000 (09:27 +0000)]
Merge "Wait for JobService to start before scheduling syncs" into nyc-dev
am:
a16a336
* commit '
a16a3362b535fcb970756a39fd4657bd15922592':
Wait for JobService to start before scheduling syncs
Change-Id: I05eb60240bb9cf4885e9e5df4470a93f89930b21
Shreyas Basarge [Tue, 26 Apr 2016 09:23:28 +0000 (09:23 +0000)]
Merge "Wait for JobService to start before scheduling syncs" into nyc-dev
Lorenzo Colitti [Tue, 26 Apr 2016 08:59:43 +0000 (08:59 +0000)]
Merge "Close open sockets when enabling firewall rules." into nyc-dev
am:
b414eb8
* commit '
b414eb8de66153d835090a1518017bc11489bce4':
Close open sockets when enabling firewall rules.
Change-Id: I2bb4be1cec701e9e99d264ab4fd2322bc20e7d2c
Lorenzo Colitti [Tue, 26 Apr 2016 08:52:24 +0000 (08:52 +0000)]
Merge "Close open sockets when enabling firewall rules." into nyc-dev
Erik Kline [Tue, 26 Apr 2016 07:19:48 +0000 (07:19 +0000)]
Merge "IpManager: delete dead getLinkProperties() code" into nyc-dev
am:
e24708e
* commit '
e24708e87f6d1f4a79a5cf3caf2edc658355263c':
IpManager: delete dead getLinkProperties() code
Change-Id: I36e2f48b9edc846a59830c935794c51b3c922ff3
Erik Kline [Tue, 26 Apr 2016 07:14:58 +0000 (07:14 +0000)]
Merge "IpManager: delete dead getLinkProperties() code" into nyc-dev
Erik Kline [Tue, 26 Apr 2016 05:39:49 +0000 (14:39 +0900)]
IpManager: delete dead getLinkProperties() code
Now that it's long since been unused also delete the locking that was
introduced to make it possible.
Bug:
17733693
Bug:
24837343
Change-Id: Iee817a7c2e1d1dc9c080d3124d5986232dcda00f
Jaewan Kim [Tue, 26 Apr 2016 06:09:00 +0000 (06:09 +0000)]
Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev
am:
bdc4700
* commit '
bdc4700155f5ff89e213cb0e9efe49897b888f7d':
PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist
Change-Id: I72405b64139580d0a95872eb5d47f3a2f5f3d28d
Jaewan Kim [Tue, 26 Apr 2016 06:02:59 +0000 (06:02 +0000)]
Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist" into nyc-dev
Lorenzo Colitti [Sun, 24 Apr 2016 03:52:00 +0000 (12:52 +0900)]
Close open sockets when enabling firewall rules.
When enabling a firewall rule that will deny networking to apps,
first close any sockets opened by those apps. Just dropping an
app's packets without closing its connections has the following
problems:
1. The app has no way to know this has happened until a network
timeout occurs.
2. The app's connections stay open, so the other end of the
connection (e.g., a server) might continue to retransmit
packets. These packets will wake up the kernel and cause
battery drain, but we cannot respond to them because packets
on those connections are dropped by the kernel (since the app
is blackholed). So the other end might keep retransmitting.
3. Even though we think the connections are still open, the
other end of the connection, or any intermediate NATs or
firewalls, might time out and close the connection (e.g., by
sending a RST). Because the app is blackholed, we have no way
of knowing that this has happened, so when the app is granted
network access again, these connections might just get stuck.
Bug:
27824851
Bug:
27867653
Change-Id: Iaaad1b26954fc5f1ba5c9ed8bdee039282f5e249
Jaewan Kim [Wed, 20 Apr 2016 12:17:58 +0000 (21:17 +0900)]
PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist
Bug:
27954955
Change-Id: I517e378d5c1672ac0eb87bdf4375b7d733276e58
Lorenzo Colitti [Tue, 26 Apr 2016 03:28:32 +0000 (03:28 +0000)]
Merge "When dumping connectivity metrics events, print data as well." into nyc-dev
am:
e4860f0
* commit '
e4860f02564e887918192f733a29f04552f83414':
When dumping connectivity metrics events, print data as well.
Change-Id: Ie2da40fc6ba7a52d359c4b0be4f938ee7eb95b73
Jorim Jaggi [Tue, 26 Apr 2016 03:28:31 +0000 (03:28 +0000)]
Fix a few issues with occluded Keyguard
am:
c5804af
* commit '
c5804afa73edbf229e789570d288e66f70b54fa2':
Fix a few issues with occluded Keyguard
Change-Id: I0e805ee2b7cf37b60b08f951bf1e0e4fdde93464
Lorenzo Colitti [Tue, 26 Apr 2016 03:22:24 +0000 (03:22 +0000)]
Merge "When dumping connectivity metrics events, print data as well." into nyc-dev
Jorim Jaggi [Tue, 26 Apr 2016 01:51:16 +0000 (18:51 -0700)]
Fix a few issues with occluded Keyguard
- When we get a collapse before the layout happened in SystemUI,
don't expand the panel after the layout.
- Don't reset waitingToShow when coming out of sleep. This will cause
win.isVisibleOrBehindKeyguardLw to return false and then occluded
state will change rapidly from true -> false -> true, leading to
flickering in SysUI.
Bug:
23898941
Change-Id: I2b941188de777086bb2b477f5bfc00cc0cd6abe0
Wale Ogunwale [Tue, 26 Apr 2016 02:27:20 +0000 (02:27 +0000)]
Merge "Don\'t hide app windows due to not showing when locked when keyguard is hidden" into nyc-dev
am:
72c216f
* commit '
72c216f25072123f498105bc7ad98a65a7a3cdaf':
Don't hide app windows due to not showing when locked when keyguard is hidden
Change-Id: I33795a8690e52d26b6f66f991b03b16bdeb665f4
TreeHugger Robot [Tue, 26 Apr 2016 02:21:16 +0000 (02:21 +0000)]
Merge "Don't hide app windows due to not showing when locked when keyguard is hidden" into nyc-dev
Jorim Jaggi [Tue, 26 Apr 2016 00:58:40 +0000 (00:58 +0000)]
Make sure to notify divider always
am:
d6a3949
* commit '
d6a39495881ee89c9217ab0764b948b6eb773aea':
Make sure to notify divider always
Change-Id: I8d39ba246a89096e2fb1462ad4e6bfe33710fd7d
Jorim Jaggi [Tue, 26 Apr 2016 00:31:22 +0000 (17:31 -0700)]
Make sure to notify divider always
In some cases, recents didn't get resumed, so divider was never
notified and thus we didn't start the animation. Instead, move
the first drawn logic into onStart.
Bug:
28366529
Change-Id: Ia71d6b517451bba727ae31a184bb55cecf5af198
Wale Ogunwale [Tue, 26 Apr 2016 00:21:34 +0000 (17:21 -0700)]
Don't hide app windows due to not showing when locked when keyguard is hidden
This worked in pre-N because the only visible app was the app that can be
shown when the keyguard is hidden. That isn't the case in multi-window mode
where one of the apps can be shown when locked and the other doesn't have
the show when locked flag. Only hide the other app if the keyguard is shown.
Bug:
28368875
Change-Id: I5039098db74492fadf667fed24fc58448436681a
Makoto Onuki [Tue, 26 Apr 2016 00:13:13 +0000 (00:13 +0000)]
Merge "When app is updated, save the new version code, and update shortcuts with resource based icons." into nyc-dev
am:
711ffe6
* commit '
711ffe620ed06c8517cad8d4d0a8f4fca588f921':
When app is updated, save the new version code, and update shortcuts with resource based icons.
Change-Id: I1b8ab5b9ede7d08f7b99f34cb54dda277b01c859
Makoto Onuki [Tue, 26 Apr 2016 00:07:57 +0000 (00:07 +0000)]
Merge "When app is updated, save the new version code, and update shortcuts with resource based icons." into nyc-dev
Shreyas Basarge [Thu, 21 Apr 2016 19:31:44 +0000 (20:31 +0100)]
Wait for JobService to start before scheduling syncs
Add code to wait for SycJobService to pass back an
instance of itself after boot before allowing syncs
to be scheduled.
Also removes unused constant MESSAGE_SYNC_EXPIRED.
Bug:
28380795
Change-Id: I616ba5c74578a81ff1e37ba4bd1fd937ce5c006d
Lajos Molnar [Mon, 25 Apr 2016 22:51:22 +0000 (22:51 +0000)]
Merge "CodecCapabilities: handle legacy VP9 codecs with no profiles" into nyc-dev
am:
af8be42
* commit '
af8be42b9f6aa17c8d17d999b53227f0a1d6da5b':
CodecCapabilities: handle legacy VP9 codecs with no profiles
Change-Id: Ice672823612c02a832e8550ad62d3ba56fa1ae57
Lajos Molnar [Mon, 25 Apr 2016 22:51:20 +0000 (22:51 +0000)]
Merge "clarify MediaCodec.setVideoScalingMode behavior" into nyc-dev
am:
4710431
* commit '
4710431dc4751e9674b9e2e620f425603cf24643':
clarify MediaCodec.setVideoScalingMode behavior
Change-Id: Ic92672b020aa9547a111e0bc728cb8edfa4a1656
TreeHugger Robot [Mon, 25 Apr 2016 22:43:29 +0000 (22:43 +0000)]
Merge "CodecCapabilities: handle legacy VP9 codecs with no profiles" into nyc-dev
Wale Ogunwale [Mon, 25 Apr 2016 22:39:16 +0000 (22:39 +0000)]
Merge "Fixed issue with wrong stack fullscreen state on configuration change" into nyc-dev
am:
b59beff
* commit '
b59beffa89b6bc4f0c2d9469443c5730787ed362':
Fixed issue with wrong stack fullscreen state on configuration change
Change-Id: Ib683c2584aaf47dccc9e4ff9957d766ccc353297
Lajos Molnar [Mon, 25 Apr 2016 22:36:53 +0000 (22:36 +0000)]
Merge "clarify MediaCodec.setVideoScalingMode behavior" into nyc-dev
TreeHugger Robot [Mon, 25 Apr 2016 22:27:56 +0000 (22:27 +0000)]
Merge "Fixed issue with wrong stack fullscreen state on configuration change" into nyc-dev
Alan Viverette [Mon, 25 Apr 2016 22:27:19 +0000 (22:27 +0000)]
Merge "Check for null drawable during LayerDrawable.jumpToCurrentState()" into nyc-dev
am:
68d180b
* commit '
68d180bbd1892ee5112c76be842a40a7251ed5a5':
Check for null drawable during LayerDrawable.jumpToCurrentState()
Change-Id: Ida4daa96fdbee8b2d566ddb054f82af9120a86f3
Jeff Sharkey [Mon, 25 Apr 2016 22:15:16 +0000 (22:15 +0000)]
Merge "Destroy both CE and DE data when corrupted." into nyc-dev
am:
436308f
* commit '
436308f88b8f165f834a6b37f7638d6d4b7a6ca7':
Destroy both CE and DE data when corrupted.
Change-Id: Ic60599ed7ee0cd200d1b95690e5e687bd403cfad
Jeff Sharkey [Mon, 25 Apr 2016 22:15:15 +0000 (22:15 +0000)]
Merge "Track down Contexts without data directories." into nyc-dev
am:
3a10c1e
* commit '
3a10c1e86db9843462660d825a9673a3c72ccdd6':
Track down Contexts without data directories.
Change-Id: Ib185bbc865fe2f1704a33b3f7557fd6c5226be1f
TreeHugger Robot [Mon, 25 Apr 2016 22:10:36 +0000 (22:10 +0000)]
Merge "Check for null drawable during LayerDrawable.jumpToCurrentState()" into nyc-dev
Alex Light [Mon, 25 Apr 2016 22:03:43 +0000 (22:03 +0000)]
Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev
am:
57413a7
* commit '
57413a74777060d9368f89966e9abcf96e33af8e':
Make fake libart for misbehaving apps be loaded.
Change-Id: I2ac86c136182d5bf84ace20a6c2dda2dffe57d40
Jeff Sharkey [Mon, 25 Apr 2016 21:59:57 +0000 (21:59 +0000)]
Merge "Destroy both CE and DE data when corrupted." into nyc-dev
Jeff Sharkey [Mon, 25 Apr 2016 21:59:40 +0000 (21:59 +0000)]
Merge "Track down Contexts without data directories." into nyc-dev
TreeHugger Robot [Mon, 25 Apr 2016 21:53:29 +0000 (21:53 +0000)]
Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev
Amith Yamasani [Mon, 25 Apr 2016 21:45:13 +0000 (21:45 +0000)]
Merge "Fix deadlock between VrManager, ActivityManager and WindowManager" into nyc-dev
am:
1d66995
* commit '
1d66995f47d548efe7863e88a8cc7bd2c66661a0':
Fix deadlock between VrManager, ActivityManager and WindowManager
Change-Id: I26ea57a0a49e78e063117f71b0f6fede8b413e7c
Amith Yamasani [Mon, 25 Apr 2016 21:37:16 +0000 (21:37 +0000)]
Merge "Fix deadlock between VrManager, ActivityManager and WindowManager" into nyc-dev
Chong Zhang [Mon, 25 Apr 2016 21:26:57 +0000 (21:26 +0000)]
Merge "Wait for next app to be visible if current activity is marked visible" into nyc-dev
am:
98afb34
* commit '
98afb342df74a657e69a478b5ace19450b579660':
Wait for next app to be visible if current activity is marked visible
Change-Id: I6fa1dd67f8bff23596277d3c55869961ffa6b220
Chong Zhang [Mon, 25 Apr 2016 21:13:27 +0000 (21:13 +0000)]
Merge "Wait for next app to be visible if current activity is marked visible" into nyc-dev
Jorim Jaggi [Mon, 25 Apr 2016 21:09:04 +0000 (21:09 +0000)]
Merge "Fix bug with cancelled drag" into nyc-dev
am:
df89cd1
* commit '
df89cd1b39bcebdd37b29185c76aa005863e8c2f':
Fix bug with cancelled drag
Change-Id: I9ebb6f5252349cb5ec7e423ee18f49d6c34c64e0
Wale Ogunwale [Mon, 25 Apr 2016 20:40:30 +0000 (13:40 -0700)]
Fixed issue with wrong stack fullscreen state on configuration change
- No need to run TaskStack#updateBoundsAfterConfigChange if the stack
is fullscreen as the bounds will already be updated to when the display
content changed due to rotation.
- Correctly set mTmpRect2 that we are using to calculate the rotated
bounds to the current mBounds.
Bug:
28319277
Bug:
27870534
Change-Id: Ic3d9407b735210351c28297de79bf035909afcfe
Jorim Jaggi [Mon, 25 Apr 2016 20:59:38 +0000 (20:59 +0000)]
Merge "Fix bug with cancelled drag" into nyc-dev
Dongwon Kang [Mon, 25 Apr 2016 20:33:09 +0000 (20:33 +0000)]
Merge "TIF: Be consistent with argument name for startRecording" into nyc-dev
am:
0751a83
* commit '
0751a83a99dc4481533ed706a942b8bb9caf8834':
TIF: Be consistent with argument name for startRecording
Change-Id: I0701d1e106c57f310e30c65bc178c5b6b4e7344a
Jeff Sharkey [Mon, 25 Apr 2016 20:33:07 +0000 (20:33 +0000)]
Merge "API changes for DownloadManager and JobScheduler." into nyc-dev
am:
c79a568
* commit '
c79a568f18dde1590d361989ff0cb6b19a61b2e9':
API changes for DownloadManager and JobScheduler.
Change-Id: I67bf3af62fdc61cb603fd362e6e361aeee85b439
Kweku Adams [Mon, 25 Apr 2016 20:33:05 +0000 (20:33 +0000)]
Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev
am:
3cabb2a
* commit '
3cabb2a6b3ae1c120a56cc4c2eaf2ba853cb3e32':
Removing extraneous field from batterystats dumpsys.
Change-Id: Ice80b3d9fce92c90d9cda3908c1e628d6bf7dde8
Lajos Molnar [Mon, 25 Apr 2016 20:07:59 +0000 (13:07 -0700)]
clarify MediaCodec.setVideoScalingMode behavior
Bug:
28131249
Change-Id: I4fd3a5333cbdc0ebec683c9a43ce071478a79d90
Lajos Molnar [Sat, 9 Apr 2016 05:59:35 +0000 (22:59 -0700)]
CodecCapabilities: handle legacy VP9 codecs with no profiles
Bug:
26935336
Change-Id: I1049b9da8e6c984f86e307990000401b66119693
Chong Zhang [Mon, 25 Apr 2016 20:17:53 +0000 (13:17 -0700)]
Wait for next app to be visible if current activity is marked visible
WM's AppWindowToken.updateReportedVisibilityLocked() may not report
nowVisible if the app has animation set. So nowVisibible could be false
for a while after the app is already on screen. If we finish the app in
this state, we still need to wait for next app to be visible.
bug:
28019637
Change-Id: I4f9f8e138f5d011a9ab393913159ed2978d26e0d
Dongwon Kang [Mon, 25 Apr 2016 20:16:21 +0000 (20:16 +0000)]
Merge "TIF: Be consistent with argument name for startRecording" into nyc-dev
Dongwon Kang [Fri, 22 Apr 2016 18:00:03 +0000 (11:00 -0700)]
TIF: Be consistent with argument name for startRecording
Change-Id: Icb0125049cc92c5664e0810cdb86f1cb0903405f
Jeff Sharkey [Mon, 25 Apr 2016 20:14:57 +0000 (20:14 +0000)]
Merge "API changes for DownloadManager and JobScheduler." into nyc-dev
Kweku Adams [Mon, 25 Apr 2016 20:09:39 +0000 (20:09 +0000)]
Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev
Jorim Jaggi [Mon, 25 Apr 2016 20:00:27 +0000 (13:00 -0700)]
Fix bug with cancelled drag
Bug:
28257206
Change-Id: Ic7342f4284185486e884836220b05423e308f7ae
Jorim Jaggi [Mon, 25 Apr 2016 19:48:32 +0000 (19:48 +0000)]
Merge "Fix stuck windows in multi-window" into nyc-dev
am:
4a96538
* commit '
4a9653841b9a011c6c2dc2a841ef21bb501602ad':
Fix stuck windows in multi-window
Change-Id: I7618c6852b03ca12887fbc9761839b42428b3a50
Jorim Jaggi [Mon, 25 Apr 2016 19:34:44 +0000 (19:34 +0000)]
Merge "Fix layout for child windows" into nyc-dev
am:
17178d9
* commit '
17178d95f2d324f4a74e5572ae403ecc58f65e40':
Fix layout for child windows
Change-Id: I279c8b4b4686d6d9092fbbccb04dbacb13367b92
Dan Sandler [Mon, 25 Apr 2016 19:34:42 +0000 (19:34 +0000)]
Merge changes from topic \'substitute-notification-app-name\' into nyc-dev
am:
955009f
* commit '
955009f9d384d1b19ebb441814ca0a3fac0fbc47':
Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
Show "Android System" instead of "System UI" in screenshot notifications.
Change-Id: Ic0b4b2460c11426c3e6b529baec3ddd3db0a6f0a
Dan Sandler [Mon, 25 Apr 2016 19:34:39 +0000 (19:34 +0000)]
Merge "Tap, don\'t touch." into nyc-dev
am:
4c40888
* commit '
4c40888673752552380d66bb9b47e230816f6fb5':
Tap, don't touch.
Change-Id: I044914c79c6214da96342fc76cd6d0636171dc43
Dan Sandler [Mon, 25 Apr 2016 19:34:34 +0000 (19:34 +0000)]
Merge "Don\'t generate stack in logcat if assistant missing." into nyc-dev
am:
5602898
* commit '
5602898dd5e9595dde59377fbad5b2beeee46510':
Don't generate stack in logcat if assistant missing.
Change-Id: I463db9fd2e78419e1bbf3dcfddc08c294fa27ccb
Jorim Jaggi [Mon, 25 Apr 2016 19:33:38 +0000 (19:33 +0000)]
Merge "Fix stuck windows in multi-window" into nyc-dev
Jorim Jaggi [Sat, 23 Apr 2016 02:50:13 +0000 (19:50 -0700)]
Fix stuck windows in multi-window
Window manager checked for the full display size so isHiddenFromUserLocked
always returned true but activity manager and other places in window manager
thought it would be visible which created a really weird state.
Bug:
28344326
Change-Id: I98daefbcc64bf7a5196588c25d2cbc5ee046a77d
Jorim Jaggi [Mon, 25 Apr 2016 19:29:39 +0000 (19:29 +0000)]
Merge "Fix layout for child windows" into nyc-dev
Jorim Jaggi [Fri, 22 Apr 2016 22:05:50 +0000 (15:05 -0700)]
Fix layout for child windows
Turns out that we also need to fit child windows to display in all
cases except NO_LIMITS is set.
Bug:
27991404
Change-Id: I34a12bbf9d0169bdb770e0e96f4b994146063e90
Amith Yamasani [Mon, 25 Apr 2016 19:23:49 +0000 (19:23 +0000)]
Merge "Fix NPE when assist data request times out" into nyc-dev
am:
bc6d96e
* commit '
bc6d96e4d09ec71a2844ea4e9281b7e849a00f80':
Fix NPE when assist data request times out
Change-Id: Ifb20aa2e1f246dacff008f539fce728c18abf14b
Jeff Sharkey [Mon, 25 Apr 2016 19:23:30 +0000 (13:23 -0600)]
Destroy both CE and DE data when corrupted.
When we find either a CE or DE data directory that has been corrupted,
destroy both CE and DE data together, since internal services like
AccountManager get confused if they find DE data without matching CE
data.
Bug:
28346537
Change-Id: Iaf3694c20e4664536af25a2afeb45fe8a90d8171
Daniel Sandler [Mon, 25 Apr 2016 19:22:38 +0000 (19:22 +0000)]
Merge changes from topic 'substitute-notification-app-name' into nyc-dev
* changes:
Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
Show "Android System" instead of "System UI" in screenshot notifications.
Daniel Sandler [Mon, 25 Apr 2016 19:21:44 +0000 (19:21 +0000)]
Merge "Tap, don't touch." into nyc-dev
Daniel Sandler [Mon, 25 Apr 2016 19:21:01 +0000 (19:21 +0000)]
Merge "Don't generate stack in logcat if assistant missing." into nyc-dev
Jeff Sharkey [Mon, 25 Apr 2016 19:20:25 +0000 (13:20 -0600)]
Track down Contexts without data directories.
Data directories for all packages should be created and managed by
installd; if we create a Context and the data directory doesn't exist
yet, we're in trouble, since a later mkdirs() would end up creating
the directory with incorrect permissions, mode, and SELinux labels.
Bug:
28272737
Change-Id: Ie3bb884ab07748719378de5c792046a031a3f945
Mady Mellor [Mon, 25 Apr 2016 19:13:03 +0000 (19:13 +0000)]
Merge "Fix gear being covered on notification update" into nyc-dev
am:
904a39c
* commit '
904a39ca92f7e616d400a8733b3970b8828da072':
Fix gear being covered on notification update
Change-Id: I4c6110c40aeff0dec30269d6117def1e0581dab2
Mady Mellor [Mon, 25 Apr 2016 19:13:02 +0000 (19:13 +0000)]
Merge "Fix the gear so that it is always centered based on the min noti height" into nyc-dev
am:
5a3e441
* commit '
5a3e4411582b1cae9b9002026b467c9c08e69a55':
Fix the gear so that it is always centered based on the min noti height
Change-Id: I4ffb1bc658323392723fecd53179b0edb9140f6d
Felipe Leme [Mon, 25 Apr 2016 19:13:00 +0000 (19:13 +0000)]
Merge "Added a \'deferred\' parameter on executeRunnableDismissingKeyguard()." into nyc-dev
am:
73624af
* commit '
73624af552ac0bfdcd60d5cb3de0e56b8be878a2':
Added a 'deferred' parameter on executeRunnableDismissingKeyguard().
Change-Id: I92dfafdc192139536dbedc365444a80a92db5028
Amith Yamasani [Mon, 25 Apr 2016 19:07:30 +0000 (19:07 +0000)]
Merge "Fix NPE when assist data request times out" into nyc-dev
Mady Mellor [Mon, 25 Apr 2016 19:06:16 +0000 (19:06 +0000)]
Merge "Fix gear being covered on notification update" into nyc-dev
Mady Mellor [Mon, 25 Apr 2016 19:05:47 +0000 (19:05 +0000)]
Merge "Fix the gear so that it is always centered based on the min noti height" into nyc-dev
TreeHugger Robot [Mon, 25 Apr 2016 18:57:29 +0000 (18:57 +0000)]
Merge "Added a 'deferred' parameter on executeRunnableDismissingKeyguard()." into nyc-dev
Bo Liu [Mon, 25 Apr 2016 18:46:49 +0000 (18:46 +0000)]
Merge "WebView doc: explain persist js across navigations" into nyc-dev
am:
b698fc9
* commit '
b698fc9d84cff493ce34dd9860f14f34ce48e8f0':
WebView doc: explain persist js across navigations
Change-Id: I6c5a3b1b4bd78014d7d9b6cc32ddc88128e33de2
TreeHugger Robot [Mon, 25 Apr 2016 18:39:45 +0000 (18:39 +0000)]
Merge "WebView doc: explain persist js across navigations" into nyc-dev
Rubin Xu [Mon, 25 Apr 2016 18:09:34 +0000 (18:09 +0000)]
Merge "Add back protected profile availibility broadcasts." into nyc-dev
am:
cda5089
* commit '
cda50893b623f19834114eb225d78fceb70b8aca':
Add back protected profile availibility broadcasts.
Change-Id: I64cb4f8be388dbadf607d19d64e4072df03ba7d2
Wale Ogunwale [Mon, 25 Apr 2016 17:58:56 +0000 (17:58 +0000)]
Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev
am:
442fd2a
* commit '
442fd2a1ddcfde18887ae712649695d6e7c384b3':
Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK
Change-Id: I505031cfb8fa177ef968dfe2a4170e31542147ec
Selim Cinek [Mon, 25 Apr 2016 17:58:55 +0000 (17:58 +0000)]
Merge "Added the ripple drawable back to the media notification" into nyc-dev
am:
08b38f8
* commit '
08b38f87ef297ed792f25041e10d036eb6f58c82':
Added the ripple drawable back to the media notification
Change-Id: Iac5eb83358ebb03f4858c2dfe74ca761a9c77396
Rubin Xu [Mon, 25 Apr 2016 17:58:28 +0000 (17:58 +0000)]
Merge "Add back protected profile availibility broadcasts." into nyc-dev
TreeHugger Robot [Mon, 25 Apr 2016 17:51:12 +0000 (17:51 +0000)]
Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev
Rubin Xu [Mon, 25 Apr 2016 17:47:36 +0000 (18:47 +0100)]
Add back protected profile availibility broadcasts.
Bug:
27532254
Change-Id: Ifbf59f64358864cd1d48be5e797c45ec2744eac0