Commit Graph

93426 Commits

Author SHA1 Message Date
Dario Freni
74e3a49702 Merge "Verify staged APKs pre-reboot." into qt-dev
am: e5e876265c

Change-Id: Icf1406811af1c425e9b934a4561457dcfd1e6495
2019-05-31 19:51:28 -07:00
Christopher Ferris
9ab82236f5 Merge "Avoid using usap when wrap property set." into qt-dev
am: cbd4908c9f

Change-Id: I1a7bc0553a08923ba0ae4a808aede578250a7310
2019-05-31 19:43:23 -07:00
TreeHugger Robot
e5e876265c Merge "Verify staged APKs pre-reboot." into qt-dev 2019-06-01 00:25:51 +00:00
Christopher Ferris
6db1108ddc Avoid using usap when wrap property set.
Bug: 133515802

Test: Verified that malloc debug can be enabled on a USAP enabled device.

(cherry picked from commit 86bd25d5ed)

Change-Id: I5f25030ce8e667d175712796c0950f38baa2532d
Merged-In: I5f25030ce8e667d175712796c0950f38baa2532d
2019-05-31 12:46:42 -07:00
Christopher Tate
991bcc3d78 Merge "Prevent double teardown of service connections" into qt-dev
am: ae76af46b2

Change-Id: I47d3b9eb266f19a9f81ef6c1447fb8f112be89dd
2019-05-31 10:34:46 -07:00
TreeHugger Robot
ae76af46b2 Merge "Prevent double teardown of service connections" into qt-dev 2019-05-31 17:27:34 +00:00
Gavin Corkery
909ced209c Merge "Perform user data back up in post install stage" into qt-dev
am: 5b9e00273b

Change-Id: Ib053ae856ba412e9057782f2b259d211c8a91972
2019-05-31 09:17:34 -07:00
Gavin Corkery
5b9e00273b Merge "Perform user data back up in post install stage" into qt-dev 2019-05-31 16:10:13 +00:00
Dario Freni
f141aab4ed Verify staged APKs pre-reboot.
Test: adb install --staged file.apk on taimen-eng target; adb
install-multi-package file1.apex file2.apex file3.apk file4.apk
Test: atest StagedRollbackTest
Bug: 123753157
Change-Id: I41121b73c0db8ca55bafd2f57cba73bb3b940149
2019-05-31 14:55:08 +01:00
Gavin Corkery
ab5ee411e5 Perform user data back up in post install stage
Currently the backup of user data is done in the enable rollback stage,
during which there is no guarantee that the package being backed up is
not currently running. Moving the backup to the post install stage will
guarantee that the package is not running.

Test: atest RollbackTest
Test: atest StagedRollbackTest
Bug: 124032231
Change-Id: I4b42a0c5ade1645585d1d6f698637df950d05c72
2019-05-31 10:26:56 +01:00
lumark
9992e08829 Merge "Skip IME initialization when received the token that already registered" into qt-dev
am: 9bb2607703

Change-Id: I47e3521b214d5b5e057c979dfe8d96696bd42009
2019-05-30 10:44:19 -07:00
TreeHugger Robot
9bb2607703 Merge "Skip IME initialization when received the token that already registered" into qt-dev 2019-05-30 17:33:17 +00:00
arangelov
31bcbb7edc Merge "Remove @VisibleForTesting from DevicePolicyEventLogger getters." into qt-dev
am: 26a28f64c5

Change-Id: I279f5764f1340f6fd7c2a4a71fe84d0e06f43bd1
2019-05-30 09:23:52 -07:00
Luke Huang
dd6b466b89 Merge "Fix issue for DnsResolver#query" into qt-dev
am: 23d7a55d18

Change-Id: I572d498fcbaf6df44a91a5b77552e497bc9f5cb7
2019-05-30 09:17:08 -07:00
TreeHugger Robot
26a28f64c5 Merge "Remove @VisibleForTesting from DevicePolicyEventLogger getters." into qt-dev 2019-05-30 15:05:26 +00:00
arangelov
3b37af4c3c Remove @VisibleForTesting from DevicePolicyEventLogger getters.
Also make it extendable for mocking and update atoms.proto comments.

Bug: 131833599
Test: compiled
Change-Id: I6a0e8a6175e7e9e46572ea4aa50ce7669a02588b
2019-05-30 14:40:12 +01:00
Luke Huang
459a5becd9 Fix issue for DnsResolver#query
1. Previously, getDnsNetId doesn't handle all the cases.
Fix it with cosidering bypass private DNS flag.
2. Make getDnsNetId return Network instead of netId,
and change name from getDnsNetId to getDnsNetwork

Bug: 129530368
Test: atest DnsResolverTest DnsUtilsTest

Merged-In: Ibb5080acd3c296650d56532fc7da525e9fa95e8f
(cherry picked from commit 3854966dc9)

Change-Id: I37353642088bcc17da0cf17f78a5ed9efc9aefc3
2019-05-30 11:58:25 +00:00
lumark
e0af39403e Skip IME initialization when received the token that already registered
When IME window switches from current display to another display and back quickly,
system will re-bind InputMethodService to re-attach window token for each moving,
the IME service lifecycle will be onBind -> onUnBind -> onDestroy -> onBind.

Ideally, system will deliver window token when onServiceConnected and system should
only receive one onServiceConnected when the last service bound.

But due to user switch display very quick, before unbind service callbacked from client,
the next bind service request comes, caused the connection exists in system side and
client will then callback 2 onServiceConnected to system.

Since CL [1] introduced InputMethodPrivilegedOperationsRegistry to deal with token
registraction singleton-ness, the exception will be thrown for above case due to
the duplicate window token passed to client.

Add InputMethodPrivilegedOperationsRegistry#isRegistered to check if the token
already registered, if so, skip this duplicate initialization request.

[1]: I4a61470f06ffac5f7a512536f8431489db0108f4

Fix: 133624278
Test: manual as below steps:
    1) Settings > Developer options, enable "Simulated display" & "force desktop mode"
    2) Reboot device.
    3) Launch app from simulated display.
    4) Launch app from primary display (i.e. contacts), focus EditText to show IME.
    5) Tapping primary & simulated display repeatly & quickly.
    6) See if any exception log from IME application. (i.e. Gboard)

Change-Id: Ie6bfbae735724fe744590e715124d2737d2b665d
2019-05-30 12:27:17 +08:00
Michael Groover
40b7cd278e Merge "Update Build#SERIAL docs to reflect device ID restrictions" into qt-dev
am: daf8086aa0

Change-Id: I73b73627da791d05bfb3b0b719f6da1356f0290b
2019-05-29 21:26:31 -07:00
Michael Groover
daf8086aa0 Merge "Update Build#SERIAL docs to reflect device ID restrictions" into qt-dev 2019-05-30 04:11:55 +00:00
Christopher Tate
36c998c6b7 Prevent double teardown of service connections
Asynchronicities in activity teardown -> service connection teardown
introduced a race in which the teardown could race with new service
bindings to "the same" service instance, and then wind up attempting to
shut down a new, valid instance inappropriately.  Fixed by making sure
to clear the "what needs to be torn down" bookkeeping as part of the
act of doing that teardown, removing the possibility for stale state.

Fixes: 131029480
Test: manual
Test: atest CtsAppTestCases
Change-Id: I33a63f524d147ff6ec97dd3efb0127dcace8bf3c
2019-05-29 18:46:09 -07:00
TreeHugger Robot
f2f679afac Merge "Make content capture send text update event for TextView even when it is not editable (EditText)" into qt-r1-dev 2019-05-30 00:25:04 +00:00
Siarhei Vishniakou
2cd6a8ae5f Merge "Close windows on ACTION_UP when touched outside" into qt-dev
am: 89ebf3f674

Change-Id: I50be8986f4ffef7024300a39a97a788a301487a5
2019-05-29 15:00:43 -07:00
Michael Groover
1279ff9dfb Update Build#SERIAL docs to reflect device ID restrictions
Bug: 133724689
Test: Build
Change-Id: I1188a1b0201730a649e3fa479989ba9d1ec3a143
2019-05-29 14:52:22 -07:00
TreeHugger Robot
89ebf3f674 Merge "Close windows on ACTION_UP when touched outside" into qt-dev 2019-05-29 21:51:22 +00:00
Cody Northrop
fc16afca20 Merge changes from topic "no_layers_profileable" into qt-dev
am: 3893e5d9ea

Change-Id: I7ff33df820d2b69e536f6431a2b67688997e26b3
2019-05-29 10:20:31 -07:00
Julia Reynolds
340b03b1cc Merge "Add snooze options setting" into qt-dev
am: f6f26e0447

Change-Id: I97dd2a7683f754854da29c955fee6fea15eac98c
2019-05-29 10:15:53 -07:00
Cody Northrop
3893e5d9ea Merge changes from topic "no_layers_profileable" into qt-dev
* changes:
  GraphicsEnvironment: No debug ANGLE packages for profileable apps
  Revert "GraphicsEnvironment: Allow profileable apps to load layers"
2019-05-29 17:10:56 +00:00
TreeHugger Robot
f6f26e0447 Merge "Add snooze options setting" into qt-dev 2019-05-29 17:03:32 +00:00
Varun Anand
dadc3c9da4 Merge changes from topic "vpn_data_accounting" into qt-dev
am: b33d2ca2e3

Change-Id: Ie336c7c3968dd8cbb2b303398620632681d516b6
2019-05-29 09:47:38 -07:00
Varun Anand
b33d2ca2e3 Merge changes from topic "vpn_data_accounting" into qt-dev
* changes:
  Add one more test for VPN usage stats.
  Addressing comments for http://ag/7700679.
  NetworkStatsService: Fix getDetailedUidStats to take VPNs into account.
  Take all VPN underlying networks into account when migrating traffic for VPN uid.
2019-05-29 16:34:14 +00:00
Sal Savage
7e2c11307d Merge "BluetoothProfileConnector: Invoke service disconnections with the correct profile ID" into qt-dev
am: 26fdabb9a0

Change-Id: I99c5c3ba059d571a55e9201a4481fb69954ce20b
2019-05-29 09:20:57 -07:00
Sal Savage
26fdabb9a0 Merge "BluetoothProfileConnector: Invoke service disconnections with the correct profile ID" into qt-dev 2019-05-29 16:08:48 +00:00
Beverly Tai
b6518a0b64 Merge "Add disable methods in StatusBarManager" into qt-r1-dev 2019-05-29 13:35:18 +00:00
Varun Anand
a229333986 Addressing comments for http://ag/7700679.
Note, that its in a separate CL so we could cherry-pick this CL to aosp.
http://ag/7700679 is already in aosp.

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests

Change-Id: I7cfda226b4ed11b67002b83b38fba0f5caf96718
2019-05-29 18:15:34 +09:00
Varun Anand
ed11b84131 NetworkStatsService: Fix getDetailedUidStats to take VPNs into account.
(cherry picked from commit 29d2ef2fe1)

This API is similar to one provided by NetworkStatsFactory with the
difference that NSS also migrates traffic from VPN UID to other apps.

Since traffic can only be migrated over NetworkStats delta, NSS
therefore maintains NetworkStats snapshot across all UIDs/ifaces/tags.

This snapshot gets updated whenever NSS records a new snapshot
(based on various hooks such as VPN updating its underlying networks,
network getting lost, etc.), or getDetailedUidStats API is invoked by
one of its callers.

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Test: manually verified that battery stats are migrating traffic off of
TUN (after patching above CL where we point BatteryStats to use this
API).

Change-Id: I4b8d7c5b6905a4a12c1806dfd35c2c4c63610404
2019-05-29 18:15:24 +09:00
Varun Anand
917327b193 Take all VPN underlying networks into account when migrating traffic for
VPN uid.

(cherry picked from commit 95aa6d446f)

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Test: Manually verified on device that stats from VPN UID are moved
      appropriately based on its declared underlying network set.
Test: vogar --mode app_process --benchmark NetworkStatsBenchmark.java

Change-Id: I7f368c5970b2dcb969fe0daf5ef44edb1f51d09d
2019-05-29 18:15:17 +09:00
PO HUNG CHEN
a3204b25e9 Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev
am: 4f179bb174

Change-Id: I5290b5d51dd98eecaa97c87eec1dc8780d1f537a
2019-05-28 19:16:20 -07:00
PO HUNG CHEN
4f179bb174 Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev 2019-05-29 02:07:06 +00:00
Feng Cao
2a42d99897 Make content capture send text update event for TextView even when it is not editable (EditText)
Test: atest CtsContentCaptureServiceTestCases
Fixes: 124203774

Change-Id: Ib79c847d68dfcde89155e18feea1bc34206269f9
2019-05-29 01:09:47 +00:00
Patrick Baumann
0c2d505dfb Merge "Fix install flag overlap" into qt-dev
am: 8b486b7870

Change-Id: I251488d03299750c6500c67be43f9e78101b1985
2019-05-28 17:58:39 -07:00
TreeHugger Robot
8b486b7870 Merge "Fix install flag overlap" into qt-dev 2019-05-29 00:45:21 +00:00
Mehdi Alizadeh
cc47620d22 Merge "Clone Persons field in ShortcutInfo only for app prediction" into qt-dev
am: f1affe0d17

Change-Id: I4ebf41e44e02b11a6de7f2885799f40988837e44
2019-05-28 16:02:24 -07:00
Mehdi Alizadeh
f1affe0d17 Merge "Clone Persons field in ShortcutInfo only for app prediction" into qt-dev 2019-05-28 22:42:19 +00:00
Patrick Baumann
72a50878fe Fix install flag overlap
When INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS was added, its value
conflicted with iINSTALL_FORCE_VOLUME_UUID. A subsequent change added
INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS to all adb install
requests, resulting in all adb installs being force UUID installs and
thus breaking adoptable storage CTS. This change fixes that overlap.

Fixes: 133215060
Test: atest android.appsecurity.cts.AdoptableHostTest#testPackageInstaller
Change-Id: I8fbfcc0eea4f4447e4a446fe188b6edfc9cec0f6
2019-05-28 15:20:15 -07:00
Jan Althaus
e6ada83349 Merge "Adding issuer information to NAS Adjustments" into qt-dev
am: bce92301c2

Change-Id: I0608b79f0cdf9e309c5c17cdb801483bd658c481
2019-05-28 12:17:09 -07:00
Cody Northrop
32adba4537 GraphicsEnvironment: No debug ANGLE packages for profileable apps
An app opting in to "profileable" does not mean we should
allow it to load ANGLE libraries from the debug package.

Bug: 128637647
Test: atest CtsGpuToolsHostTestCases
Change-Id: I5c6ea33a1e1624e006bc4865bc0a06ea92d9d806
2019-05-28 12:59:46 -06:00
TreeHugger Robot
bce92301c2 Merge "Adding issuer information to NAS Adjustments" into qt-dev 2019-05-28 18:55:59 +00:00
Julia Reynolds
789bf3fab3 Add snooze options setting
Whether or not snooze options should be shown for notifications

Test: atest
Bug: 133494458
Change-Id: Ia3232763318effffc941f1b9ed0c6a57973ba614
2019-05-28 18:15:20 +00:00
Cody Northrop
c558c0c15a Revert "GraphicsEnvironment: Allow profileable apps to load layers"
This reverts commit 3832aa9906.

Loading layers for apps that have opted for "profileable" breaks
the Android security model.  They have only consented to exposing
profiling information, not exposing data under its control.  Layers
have access to everything in the API calls.

Bug: 128637647
Test: atest CtsGpuToolsHostTestCases
Change-Id: I5aed181c3cec616c3ce98a1a30287b30f190ba9b
2019-05-28 12:05:56 -06:00