280263 Commits

Author SHA1 Message Date
Torne (Richard Coles)
e19d6d414d Merge "Add the webview zygote socket to the zygote whitelist." am: f8882ae834
am: bc801c663e

Change-Id: If1edf0bf30e8359912235c788a49131b528efb30
2016-12-16 21:45:40 +00:00
Michael Kwan
67639a5f67 Fix OnCancelListener for Dialogs on swipe to dismiss.
Swipe to dismiss on dialogs did not dispatch onCancel events
to OnCancelListeners. Resolve by adding listener to monitor
swipe to dismiss events and dispatch onCancel events when
that occurs.

Bug: 33663411
Change-Id: I64ff29e008d485a4559eb3d1ff7f0e74dccff404
2016-12-16 13:43:16 -08:00
Torne (Richard Coles)
bc801c663e Merge "Add the webview zygote socket to the zygote whitelist."
am: f8882ae834

Change-Id: I02d08d8f91567b8bd6709137f98f87550c13f145
2016-12-16 21:38:17 +00:00
Treehugger Robot
f8882ae834 Merge "Add the webview zygote socket to the zygote whitelist." 2016-12-16 21:25:35 +00:00
Todd Kjos
bac0d87926 Merge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp
am: 85a19e86d0

Change-Id: I240a2ae5d97e275d3660a7a2d5e9f2e5e222e813
2016-12-16 21:14:16 +00:00
Todd Kjos
aaa695809a Revert "Add boost to increase the load on newly-forked zygote processes."
am: 80fb0b0a44

Change-Id: Iaec14c37eb4bdf685d47ff28d7caa652bb1057dc
2016-12-16 21:14:13 +00:00
Vitalii Tomkiv
8b238abd30 Make sure Zygote is running at process priority 0 after VM has started.
am: 5cbce85fd3

Change-Id: If47c73fe85b16337e2c60715edb1861e7ef244d3
2016-12-16 21:13:35 +00:00
TreeHugger Robot
85a19e86d0 Merge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp
* changes:
  Revert "Add boost to increase the load on newly-forked zygote processes."
  Make sure Zygote is running at process priority 0 after VM has started.
2016-12-16 21:03:00 +00:00
Philip P. Moltmann
c56da03d06 Increment vers of PrintRecommendationService
as the Samsung PlugIn was updated.

Test: Let the service generate some recommendations
Change-Id: Ief7ea4f1dddfee92aa9fa83ff53b296ced0e3b55
2016-12-16 12:52:53 -08:00
Joe LaPenna
6fcaf62ab7 Merge "Set com.android.networkrecommendation as the default network recommendation service." am: 0b4df21aac am: 4c3b2f5f99
am: de89c74f51

Change-Id: Iac44d02fa3fc12ca3d375c60a98bad67d0dc21c9
2016-12-16 20:51:56 +00:00
Joe LaPenna
de89c74f51 Merge "Set com.android.networkrecommendation as the default network recommendation service." am: 0b4df21aac
am: 4c3b2f5f99

Change-Id: I7ee10f1336c48969fa64cd6f5a45087027a2e8c3
2016-12-16 20:44:05 +00:00
Joe LaPenna
4c3b2f5f99 Merge "Set com.android.networkrecommendation as the default network recommendation service."
am: 0b4df21aac

Change-Id: Ia955fd0d980a5ddcdb5ae6880c7a380251819f44
2016-12-16 20:35:53 +00:00
Treehugger Robot
0b4df21aac Merge "Set com.android.networkrecommendation as the default network recommendation service." 2016-12-16 20:23:48 +00:00
Andreas Gampe
33e85b79d2 Merge changes Ia4bec085,I59095f2a am: 733d007279 am: 3d17e17b0a
am: 2260a6ef9a

Change-Id: I5fd2ded2e619178487606fb6cae91401b92448d8
2016-12-16 19:55:48 +00:00
Tamas Berghammer
f00963c71f Enable logwrapper functionality on user builds am: 0ca16fa584 am: db05d4b4ed
am: ed8757a761

Change-Id: I0f27f6aeb58690addb1c5f7978047ccb8d73ab84
2016-12-16 19:54:58 +00:00
Tamas Berghammer
b8d0e4d9fc Zygote: Add invoke-with to zygote protocol am: b8f7c351b9 am: 45c2fffc52
am: d71bb300e6

Change-Id: Ied54640c44ade52abd6a905526ba7789be14a332
2016-12-16 19:54:11 +00:00
Andreas Gampe
2260a6ef9a Merge changes Ia4bec085,I59095f2a am: 733d007279
am: 3d17e17b0a

Change-Id: I835f1efcf985c73db9ddb5ffe15d80842afdf6e2
2016-12-16 19:47:42 +00:00
Tamas Berghammer
ed8757a761 Enable logwrapper functionality on user builds am: 0ca16fa584
am: db05d4b4ed

Change-Id: Ic6c3395f9965657a7f9abe580867eeb81b59ed88
2016-12-16 19:46:55 +00:00
Tamas Berghammer
d71bb300e6 Zygote: Add invoke-with to zygote protocol am: b8f7c351b9
am: 45c2fffc52

Change-Id: I90999d84c9694bfeebea8d2c2d95d1d545bac7e8
2016-12-16 19:46:03 +00:00
Andreas Gampe
3d17e17b0a Merge changes Ia4bec085,I59095f2a
am: 733d007279

Change-Id: Id0f0746af66b4f2e0352e2a0dde9d3f27e23f84c
2016-12-16 19:38:43 +00:00
Tamas Berghammer
db05d4b4ed Enable logwrapper functionality on user builds
am: 0ca16fa584

Change-Id: Ic18991f9a59f05356fcbcc65acc79be43fc68542
2016-12-16 19:38:38 +00:00
Tamas Berghammer
45c2fffc52 Zygote: Add invoke-with to zygote protocol
am: b8f7c351b9

Change-Id: I79db6f759b02ef612364fc857102615d51900cd9
2016-12-16 19:37:57 +00:00
Todd Kjos
80fb0b0a44 Revert "Add boost to increase the load on newly-forked zygote processes."
This reverts commit 6d43a861d01ef48f37c69f96346a13d23164a585.

(cherry picked from commit 0f2ded62ae3d88ddb732df182c3bfee3e2729018)

Test: m
Test: Device boots
Change-Id: I627e47c6ead4ce2d2bffa923a32a56d06c022df7
2016-12-16 11:31:30 -08:00
Christine Franks
8ec23fe5b5 Merge "Add config_demoModePassword" into nyc-mr2-dev
am: ee3af13cf2

Change-Id: I90badd6bc1069e015331c697bbde912465e918c1
2016-12-16 19:31:22 +00:00
Adam Lesinski
45489787d7 Reset BatteryStats when too large for clients to handle
When BatteryStats history is too large, the Settings app crashes.
Reset the battery stats by marking an *OVERFLOW* event at the
beginning of the newly reset history.

This seems to happen in Retail mode when the devices are on charger
for an extended period of time and accumulate a sufficiently large
history. Resetting makes sense because the phone is most likely
charged and will reset anyways when unplugged.
Bug: 32540341
Test: Manual

Change-Id: I8c2892458b5d9ce64b1c44aa2e2a000340e71e63
2016-12-16 19:27:53 +00:00
Andreas Gampe
733d007279 Merge changes Ia4bec085,I59095f2a
* changes:
  Enable logwrapper functionality on user builds
  Zygote: Add invoke-with to zygote protocol
2016-12-16 19:24:13 +00:00
Marie Janssen
fa63068deb Bluetooth: fix issues re-enabling after crash
When Bluetooth crashes, sometimes an LE app restarts it before
ActivityManager gets a chance.  In this case, the Bluetooth manager
would assume the state should be LE only and did not continue to fully
enabled.

Luckily in this case the persisted system state is also ON.  Use the
persisted state as information about whether we should be fully enabled.

Test: basic sanity check, forced crash of BT
Bug: 33632976
Change-Id: I546d7abccb82a26fcca2eb70d6d7c76e9510404e
2016-12-16 11:23:30 -08:00
Marie Janssen
ffcf88f36e Bluetooth: log message improvements
Some log improvements:
 - Reduce logspam
 - Use names for states in logs instead of numbers
 - Be more consistent with messages

Also remove some commented out dead code.

Test: run on phone, observe more useful logs
Change-Id: I32163278e148be144c03d4e8aaf0eb761226c94c
2016-12-16 11:22:04 -08:00
Vitalii Tomkiv
5cbce85fd3 Make sure Zygote is running at process priority 0 after VM has started.
Boosting up zygote priority before VM startup, saves ~450ms of boot time
for N9, 180ms for Nexus 5X.

(cherry picked from commit 5d551a5ac3d13706f62a86842ff6851e1d25213b)

Bug: 28866384
Test: m
Test: Device boots
Change-Id: Ic85892b408e15bbc1de7ce706f113f23974fe478
2016-12-16 11:19:33 -08:00
Christine Franks
22ed8175ce Add config_demoModePassword
am: 566525c6bb

Change-Id: Idc99f301b936be1f1a8a70b33f2ff02f396f9da0
2016-12-16 19:17:33 +00:00
Christine Franks
ee3af13cf2 Merge "Add config_demoModePassword" into nyc-mr2-dev 2016-12-16 19:10:59 +00:00
Android Build Merger (Role)
0979227c6f Merge "Merge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev am: 6ce17fb072" into nyc-mr2-dev-plus-aosp 2016-12-16 19:03:07 +00:00
Android Build Merger (Role)
c584b7191d Merge "FalsingLog: Fix false positive Log.wtfs am: 64f87bad12" into nyc-mr2-dev-plus-aosp 2016-12-16 19:02:48 +00:00
Adrian Roos
d980b03299 Merge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev
am: 6ce17fb072

Change-Id: Id22b291757e72e7aa2e56e1f2ed65f7dcb7b00b0
2016-12-16 19:02:05 +00:00
Adrian Roos
5b5faea151 FalsingLog: Fix false positive Log.wtfs
am: 64f87bad12

Change-Id: Ief66fe0f832737f733d728a8b0533bcabfc3c57c
2016-12-16 19:01:58 +00:00
Andreas Gampe
49a25312b9 Merge "NativeLibraryHelper: Minor fixes" am: c1536f0d10 am: 109a82d7e3
am: 77274269ba

Change-Id: Id450c7da8d22390c0e7506ed9058bdbf261d3ef4
2016-12-16 19:01:52 +00:00
Torne (Richard Coles)
898fd69451 Add the webview zygote socket to the zygote whitelist.
Allow the webview zygote socket to be open at time of fork, so that
webview renderers can be forked successfully.

(cherry picked from commit a7fcb2bc2a65da3743914727adb0df89a4eb0b66)

Test: WebView functions correctly with multiprocess dev setting enabled
Bug: 21643067
Change-Id: I312846433a43a8e4548cb2f98b96b56acf9f5333
2016-12-16 10:53:35 -08:00
Andreas Gampe
77274269ba Merge "NativeLibraryHelper: Minor fixes" am: c1536f0d10
am: 109a82d7e3

Change-Id: I362df209d24a9e2602da1b8cf72e4ea63b5e7f60
2016-12-16 18:53:01 +00:00
Kaori Katou
ed7bf5eecc Assist app is not launched when long-pressing on Home key
To get Assist component and launch it correctly,
The proper userId should be passed
to AssistUtils#getAssistComponentForUser().

Bug: 30777883
Test: manual - install LegacyAssistant app and long-press on Home key

Change-Id: I9f18ffdd9fc893235d77ed8145a765736a679478
(cherry picked from commit 70554e01c64101bb7e5a511be328ae774a6f451c)
2016-12-16 10:52:20 -08:00
Adrian Roos
6ce17fb072 Merge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev 2016-12-16 18:49:56 +00:00
Andreas Gampe
109a82d7e3 Merge "NativeLibraryHelper: Minor fixes"
am: c1536f0d10

Change-Id: I81e69315c5f74341ddf3472263462f8fdf935797
2016-12-16 18:44:54 +00:00
Joe LaPenna
56346808a1 Set com.android.networkrecommendation as the default network recommendation service.
BUG: 33224286
Test: Build image and verified the config value was set.

Change-Id: Id657c28753eaa6050bb2d82e45f70f694ce7e7dd
Merged-In: Id657c28753eaa6050bb2d82e45f70f694ce7e7dd
2016-12-16 10:42:23 -08:00
Treehugger Robot
c1536f0d10 Merge "NativeLibraryHelper: Minor fixes" 2016-12-16 18:31:25 +00:00
phweiss
c94b637305 DO NOT MERGE Add network logging icon to Quicksettings when enabled
Add the network logging icon in Quick Settings' footer if
network logging is enabled, possible next to the VPN icon.
Quicksettings has to be able to tell that network logging
is enabled, so this CL changes DPM.isNetworkLoggingEnabled() to be
callable from the device owner or from any app with the MANAGE_USERS
permission.

The icon is only a placeholder until the official icon is finished.

CTS Verifier tests will be added when all Network logging UX changes are
done.

Cherry-picked from master, and then modified to work in N:
I had to remove the QSFooterTest change because the testing infrastructure
is not there in N. Also, I had to add DPMS.enforceDeviceOwnerOrManageUsers()
to which did not exist in N before.

BUG: 33126618
BUG: 29748723
Test: Manual, CTS-Verifier tests will be added in a follow-up

(cherry picked from commit a4e169ed68ee57aa249e5e79fcd6bff5df46199e)

Change-Id: Ib35d323605ab11f883a4b6199d1db79b9e53c49b
2016-12-16 19:25:29 +01:00
Michal Karpinski
a775ad997b Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Bug: 29748723

(cherry picked from commit e4dfd2d0028ff1c7088ec58a4d3eaf8f222311e6)

Change-Id: Ib175f1d57093590b0080f32dc5f6c60ea50066e0
2016-12-16 18:18:57 +00:00
Vitalii Tomkiv
1e52ce48a6 Make sure Zygote is running at process priority 0 after VM has started.
Boosting up zygote priority before VM startup, saves ~450ms of boot time
for N9, 180ms for Nexus 5X.

(cherry picked from commit 5d551a5ac3d13706f62a86842ff6851e1d25213b)

Bug: 28866384
Test: m
Test: Device boots
Change-Id: Ic85892b408e15bbc1de7ce706f113f23974fe478
2016-12-16 09:06:28 -08:00
Todd Kjos
8175f0955a Revert "Add boost to increase the load on newly-forked zygote processes."
This reverts commit 6d43a861d01ef48f37c69f96346a13d23164a585.

(cherry picked from commit 0f2ded62ae3d88ddb732df182c3bfee3e2729018)

Test: m
Test: Device boots
Change-Id: I627e47c6ead4ce2d2bffa923a32a56d06c022df7
2016-12-16 09:05:50 -08:00
Tamas Berghammer
0ca16fa584 Enable logwrapper functionality on user builds
When an app is debuggable, check whether a script called "wrap.sh" exists
in the app's native library directory. If so, start the app using the
invoke-with functionality over the script. Weaken the invoke-with check
on the zygote side to allow the functionality for debuggable apps.

The goal of the functionality is to make malloc debug, strace and other
similar tools available for NDK based application developers.

Bug: 33668201
Test: manual - debug malloc can be enabled using the new feature
Change-Id: Ia4bec0854cf4dc08446f1671494200f54ef366ee
2016-12-16 09:03:06 -08:00
Tamas Berghammer
b8f7c351b9 Zygote: Add invoke-with to zygote protocol
Add "--invoke-with" to the zygote connection protocol. It was
already understood as an argument by the zygote.

Bug: 33668201
Test: m
Change-Id: I59095f2ac542aadff78a7ff1dded86cf5f192707
2016-12-16 09:03:01 -08:00
Andreas Gampe
c012ae3815 NativeLibraryHelper: Minor fixes
Skip over directories when iterating library files. Ensure correct
temp file naming.

Bug: 33668201
Test: m
Test: Device boots
Test: Manual: Install debuggable and non-debuggable apps
Change-Id: I2f0547e965d9a0c478e333a13b2db02f4eedac2c
2016-12-16 08:23:55 -08:00