Commit Graph

301953 Commits

Author SHA1 Message Date
Narayan Kamath
c82eb23651 Zygote : Block SIGCHLD during fork. am: dfcc79ee8e
am: 720fcbc1f7

Change-Id: I18aeb47e1a4f061d5afe55a2aa936ae1d1cc61ff
2016-11-10 10:21:57 +00:00
Narayan Kamath
c0df29dfbc Merge "Zygote : Block SIGCHLD during fork." into nyc-dev
am: a67112ca92

Change-Id: Ib8bef283e74694a415dc73f2c16b4de3b201798e
2016-11-10 10:15:59 +00:00
Narayan Kamath
720fcbc1f7 Zygote : Block SIGCHLD during fork.
am: dfcc79ee8e

Change-Id: I64b380e54d73c777898ece33ba62b838b556921b
2016-11-10 10:15:56 +00:00
Bill Yi
37fa5cbc28 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 32766034
Change-Id: I3116c8192dcb7e203d6551eaa50e6faf4220cd0e
2016-11-10 02:13:53 -08:00
Narayan Kamath
b1f1209d9a Zygote : Block SIGCHLD during fork.
We close the android logging related sockets prior as late as possible
before every fork to avoid having to whitelist them. If one of the
zygote's children dies after this point (but prior to the fork), we can
end up reopening the logging sockets from the SIGCHLD signal handler.

To prevent this from happening, block SIGCHLD during this critical
section.

Bug: 32693692
Test: Manual

(cherry picked from commit e9a525829a)

Zygote: Unblock SIGCHLD in the parent after fork.

Follow up to change e9a525829a. Allows the zygote to
receive SIGCHLD again and prevents the zygote from getting into a
zombie state if it's killed.

Contributed-By: rhed_jao <rhed_jao@htc.com>
Bug: 32693692
Test: manual

(cherry picked from commit 1480dc3e97)

Change-Id: If89903a29c84dfc9b056f9e19618046874bba689
2016-11-10 10:06:01 +00:00
Narayan Kamath
a67112ca92 Merge "Zygote : Block SIGCHLD during fork." into nyc-dev 2016-11-10 10:04:13 +00:00
Akira Oshimi
8fbcb7630a Add null check before finish SystemUI Tuner's activity
SystemUI Tuner's activity changes to null when Multi-window's state is
changed after confirmation dialog about removing SystemUI Tuner is
shown. Then NullPointerException occurs by trying to finish the
activity to tap "REMOVE" button on the confirmation dialog.
So add null check before finish the activity.

Bug: 32786029
Test: manual - remove System UI Tuner on Multi-Window mode

Change-Id: I455d17c0c600eeb05c9dfb7d609d40307de2f855
2016-11-10 09:09:25 +00:00
Lorenzo Colitti
667f31278e Merge "Unbreak TetherInterfaceStateMachineTest." 2016-11-10 08:37:58 +00:00
TreeHugger Robot
186ea0f170 Merge changes I93b8ed74,I43decfee
* changes:
  Update callbacks when initializing to initial state
  UI Keyguard fixes
2016-11-10 08:26:56 +00:00
Jorim Jaggi
e8f321e749 Update callbacks when initializing to initial state
This fixes a bug where activity manager was not informed about the
lockscreen state if Keyguard was disabled and SystemUI crashed, so
we just displayed a black screen.

Test:
- Set no lockscreen
- Crash SystemUI

Change-Id: I93b8ed74dd12af6903ffdb05b59c78f2f12febb4
2016-11-09 23:54:01 -08:00
Jorim Jaggi
8d5a6e7ce3 UI Keyguard fixes
- Streamline the various keyguardDone paths. The keyguard will be
dismissed if and only if both the hide animation has run and the
Keyguard is ready for dismissal. This fixes a bug in which the
hide animation was not run.
- When we get an external dismiss call, make sure to collapse the
panel as well.
- When we execute an action and Keyguard is occluded, we execute
if after the Keyguard is gone so there are no weird transition
because Keyguard might get unoccluded.

Test: Manual for the above flows.

Bug: 30961403
Bug: 27422134
Change-Id: I43decfeec270c4ed628bd9479109150c57201dae
2016-11-09 23:54:00 -08:00
TreeHugger Robot
0d5ee3fae4 Merge "Import translations. DO NOT MERGE" 2016-11-10 04:56:57 +00:00
TreeHugger Robot
d6629e1d80 Merge "Import translations. DO NOT MERGE" 2016-11-10 04:56:07 +00:00
TreeHugger Robot
aad0c779f5 Merge "Catch a missed case when adding a toast" 2016-11-10 04:18:00 +00:00
Yohei Yukawa
d0bbe2176f Add comments for some int fields in EditorInfo
As a preparation to add a new flag into EditorInfo, this CL aims to make
it clear what bits in EditorInfo are already used and what bits are
still available for new features.

There should be no behavior change because there is no code change.

Bug: 28157942
Test: compile, as there is no actual code change
Change-Id: Ie4b216dbb0978d8dc1c5e91762b87d065c7a1cac
2016-11-09 19:49:50 -08:00
Andriy Naborskyy
c5bf8bc74d DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"
This reverts commit 80e6d8873b.

Bug: 32771832

Change-Id: Ia2f2ffd08dfd87cbce1ec750d6b61277799b536f
2016-11-10 03:17:08 +00:00
Hugo Benichi
f88508bd3e DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
This patch creates a new permission used by ConnectivityService to give
access to restricted networks without the NET_CAPABILITY_NOT_RESTRICTED
capability bit on.

Bug: 24497316
Change-Id: I5b6c8a9ef14395b2f1ab26cb17b24d7876ec79f1
2016-11-09 19:08:30 -08:00
Alain Vongsouvanh
4784f14a15 colors: Properly set the default accent colors. am: 7b371575e4 am: e616fa1789
am: f7f79980ee

Change-Id: I74a5f5dbcf1d6503971f857829b8aea3dea97529
2016-11-10 02:53:03 +00:00
Alain Vongsouvanh
f7f79980ee colors: Properly set the default accent colors. am: 7b371575e4
am: e616fa1789

Change-Id: I111e3491c067fe286608c5df73f9d5da90373570
2016-11-10 02:47:29 +00:00
Svetoslav Ganov
200adfbea8 Catch a missed case when adding a toast
We allow a single toast window per UID. It is possible that
the UID had another toast window that is going away and this
CL adds a catch all check as there was a case missing.

Change-Id: I4c68e7212a05ce349e6e5b1cffe6e36d429aaca0
2016-11-09 18:43:06 -08:00
Alain Vongsouvanh
e616fa1789 colors: Properly set the default accent colors.
am: 7b371575e4

Change-Id: Icff01bd37726c9a77a80f1afb501390bb3ddc629
2016-11-10 02:40:55 +00:00
TreeHugger Robot
72c532acbb Merge "Traverse window hierarchy without window list" 2016-11-10 02:14:15 +00:00
Hugo Benichi
a0cfb157ec resolve merge conflicts of 89aa6fb to mnc-dr-dev
Change-Id: I9e4e538081600be6a8199060bcb0d4040c071a22
2016-11-10 10:31:31 +09:00
Alain Vongsouvanh
7b371575e4 colors: Properly set the default accent colors.
The 700 and 50 variant of the default accent colors were pointing to the
wrong material resources (deep_teal instead of accent).
This CL also update the watch colors to the proper specs.

BUG: 32087183
Change-Id: Ib8a23d9078e79bc0fdf6da893b4dff12954c2cbb
2016-11-10 01:14:55 +00:00
TreeHugger Robot
446e723c08 Merge "The big Keyguard transition refactor (8/n)" 2016-11-10 00:54:54 +00:00
TreeHugger Robot
4bd26bef66 Merge "Add event logging for UserState transitions." 2016-11-10 00:02:14 +00:00
Wale Ogunwale
b783fd8a08 Traverse window hierarchy without window list
Added support for to get all windows in the hierarchy without needing
to use WindowList concept which is a very complicated implementation
in the code base.
This implementation walks the hierarchy node by node returns windows
in order to the caller using a callback.

Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests
Change-Id: I2719f7c96f26dad23f91c1c589be88712bd224b8
2016-11-09 15:54:00 -08:00
FEI WU
9072dcd82c Update colorPrimary in watch
1. Update colorPrimary in watch. This value is only used for icons and
switch background on watch.

2. Replace hard coded color and disable alpha in switch track.

3. Rename watch_switch_track_mtrl_alpha to be  watch_switch_track_mtrl
since it's no longer a alpha mask.

Change-Id: Ia1eaae62a934c89e3ca6cc8736b256c552f0329b
2016-11-09 15:53:46 -08:00
Tamas Berghammer
d6dd6b8a61 Install all files from the lib directory for debuggable apps
This is required to support developer tools what want to install helper
code (e.g. scripts, executables) into the apps lib directory.

Test: manual - install debuggable & non-debuggable app
Change-Id: Ibceb827f92a09735d7c605e689e23c0cd293a6fd
2016-11-09 23:50:49 +00:00
Jorim Jaggi
e69c93181f The big Keyguard transition refactor (8/n)
Don't force mKeyguardGoingAway, as this never recovers. Make sure
to only show the dismissing Keyguard activtiy and recover the
state when trusted state changes.

Test: Make sure Keyguard is in a trusted state, start an activity
with FLAG_DISMISS_KEYGUARD from FLAG_SHOW_WHEN_LOCKED activity
and make sure there is no flicker.

Bug: 32057734
Change-Id: I5d212f6f9d5430250b22c8370f45dc95756432d2
2016-11-09 15:32:04 -08:00
Selim Cinek
a3fa81358f Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev am: 6a6bc370e9
am: aaa70f5d37

Change-Id: Ia3f4705c1a84f87629842fe13c9064b41ae4975c
2016-11-09 23:26:07 +00:00
Selim Cinek
2d29dc66bc Fixed a bug with the emergency affordance in multi user am: 0294f9e39b
am: 00b6a1dded

Change-Id: I6e50a09eedb9acecab481d615e2d63c5508b1268
2016-11-09 23:24:50 +00:00
Selim Cinek
aaa70f5d37 Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev
am: 6a6bc370e9

Change-Id: Iae4342afea01390f6b2567832f863881907dacb0
2016-11-09 23:19:25 +00:00
Selim Cinek
00b6a1dded Fixed a bug with the emergency affordance in multi user
am: 0294f9e39b

Change-Id: Ib23d37b6ac5cc32aa77aa099c3fa2937ff3570d3
2016-11-09 23:19:19 +00:00
TreeHugger Robot
6a6bc370e9 Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev 2016-11-09 23:05:43 +00:00
Bill Yi
294618f66d Import translations. DO NOT MERGE
Change-Id: If0da996cf52bec08bb2b154664908c76bee507bd
Auto-generated-cl: translation import
2016-11-09 14:35:41 -08:00
TreeHugger Robot
d7dde6b793 Merge "Keyguard: Fix screenTurnedOn trace tag" 2016-11-09 22:07:59 +00:00
Bill Yi
2c9be7b2a5 Import translations. DO NOT MERGE
Change-Id: I72312b850912a5c47a318ebb60f4545a0c00f5e9
Auto-generated-cl: translation import
2016-11-09 14:01:42 -08:00
Xin Li
9c214b8839 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours am: 4146229e69 am: 0bf282606f am: 0326b807fa am: d478287ab9 am: a29c7c77b1
am: 7bd6cdf057  -s ours

Change-Id: I62cc0c04b1bb35b2e1745e7eef44ba5f74a8fab4
2016-11-09 21:37:49 +00:00
Xin Li
aa437b194b Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours am: d167a27c1f am: 892385f520 am: 4c1922b441 am: ba293f3c28 am: a009932a57
am: a732c69257  -s ours

Change-Id: Icbc86a35dd1b368e4796550be2280e08b17d5eb8
2016-11-09 21:36:34 +00:00
Kevin Su
211c1c2ca8 Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte.
Regenerate api accordingly.
BUG: 32609966
Test: CTS Testing new API

Change-Id: I2603fc0001f31ff23f02f4fdf2a72b33f2750a4c
2016-11-09 13:27:20 -08:00
Xin Li
7bd6cdf057 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours am: 4146229e69 am: 0bf282606f am: 0326b807fa am: d478287ab9
am: a29c7c77b1

Change-Id: Id4428dfa09f0c0d24c045ce2ae2fb1abad3aaa15
2016-11-09 21:26:57 +00:00
Xin Li
a732c69257 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours am: d167a27c1f am: 892385f520 am: 4c1922b441 am: ba293f3c28
am: a009932a57

Change-Id: I5cf1015e071c8a98d63fc318088746c9728f3795
2016-11-09 21:25:42 +00:00
Xin Li
a29c7c77b1 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours am: 4146229e69 am: 0bf282606f am: 0326b807fa
am: d478287ab9

Change-Id: Ie236947ac81a8415e0c382daf4a6527337d3e78b
2016-11-09 21:14:56 +00:00
Xin Li
a009932a57 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours am: d167a27c1f am: 892385f520 am: 4c1922b441
am: ba293f3c28

Change-Id: I5fda98c9f3c5f0c8abd133a960e32ef058c261c2
2016-11-09 21:13:43 +00:00
Android Build Merger (Role)
434ac05eba Merge "Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am: 12f98789bf am: acdb6bb1aa am: e3d31ebc0e am: dac1d242ab am: 2b3a352a4d am: bec3a79a27" 2016-11-09 21:11:53 +00:00
Narayan Kamath
165e6bfefc Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am: 12f98789bf am: acdb6bb1aa am: e3d31ebc0e am: dac1d242ab am: 2b3a352a4d
am: bec3a79a27

Change-Id: I9973287f85c8f40a15e67ba4069c6904216342cb
2016-11-09 21:11:06 +00:00
Android Build Merger (Role)
a6f544110e Merge "Zygote: Additional whitelists for runtime overlay / other static resources. am: 25cd01cc69 am: 4f65baa12f am: 76a388b93b -s ours am: 30a6da2b14 am: c8044be01e am: efc25ed0e8" 2016-11-09 21:10:45 +00:00
Narayan Kamath
af2110cf89 Zygote: Additional whitelists for runtime overlay / other static resources. am: 25cd01cc69 am: 4f65baa12f am: 76a388b93b -s ours am: 30a6da2b14 am: c8044be01e
am: efc25ed0e8

Change-Id: I370a8b2690a59c682a0fe633f28fbf43d96293b2
2016-11-09 21:10:00 +00:00
Android Build Merger (Role)
9148860cce Merge "Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630 am: 1a06ebfcac am: 781d8f7426 am: c8ac64aca7 am: b7f279051e am: d05a06d1e2 -s ours" 2016-11-09 21:09:39 +00:00