Commit Graph

420756 Commits

Author SHA1 Message Date
Android Build Merger (Role)
f20fcc58aa Merge "[automerger skipped] Merge "Convert PrintRecommendationService to Android.bp." am: cb36cba281 am: 0f7affc025 -s ours am skip reason: change_id I4ff0577a0c27b8a451e6aca2c62c2437481c2a0c with SHA1 bbcb87ffa2 is in history" into qt-dev-plus-aosp 2019-05-29 16:54:32 +00:00
Jaewoong Jung
4afa594b7c [automerger skipped] Merge "Convert PrintRecommendationService to Android.bp." am: cb36cba281
am: 0f7affc025 -s ours
am skip reason: change_id I4ff0577a0c27b8a451e6aca2c62c2437481c2a0c with SHA1 bbcb87ffa2 is in history

Change-Id: I487a284e1a2b309d87c0415704dbc9faddfe3780
2019-05-29 09:53:52 -07:00
Beverly
e0d4554fa0 Merge "Change suppresible type of voice comm signalling" into qt-dev
am: c9dcf2ff78

Change-Id: If272dbfe8acec4020c78b834d786890af2261c9f
2019-05-29 09:53:34 -07:00
Jaewoong Jung
0f7affc025 Merge "Convert PrintRecommendationService to Android.bp."
am: cb36cba281

Change-Id: I815a11495b8305207cb646a4ab79cb6fe660cccc
2019-05-29 09:44:34 -07:00
Varun Anand
ebf59f07b1 Merge changes from topic "vpn_data_accounting" into qt-dev
am: b33d2ca2e3

Change-Id: I234eb2b20f47bde94b4aba89867e9d1c7e9ee7d5
2019-05-29 09:44:04 -07:00
TreeHugger Robot
c9dcf2ff78 Merge "Change suppresible type of voice comm signalling" into qt-dev 2019-05-29 16:37:30 +00: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
Jaewoong Jung
cb36cba281 Merge "Convert PrintRecommendationService to Android.bp." 2019-05-29 16:21:58 +00:00
Sal Savage
4c52964017 [automerger skipped] Merge "BluetoothProfileConnector: Invoke service disconnections with the correct profile ID" into qt-dev
am: 26fdabb9a0 -s ours
am skip reason: change_id Id8dbeaf844a65020f610505f81eea20b96ec002a with SHA1 4afdab44ab is in history

Change-Id: I7b7c78b48872442d8b9100a19f78d0a50e8d6c94
2019-05-29 09:20:50 -07:00
Nate Myren
905c22a18d Merge "Changed comments to match real protection level" into qt-dev
am: b23292da1d

Change-Id: I8bdd28453f82179714f89066fc15f880ece70d0e
2019-05-29 09:19:12 -07:00
Patrick Baumann
01d9108ebb Merge "Appropriately sets all installs on *any* failure of one" into qt-dev
am: d42032e5e2

Change-Id: I22db611056e4c5a447ee07cc087c38db1b794ea9
2019-05-29 09:09:55 -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
TreeHugger Robot
b23292da1d Merge "Changed comments to match real protection level" into qt-dev 2019-05-29 16:01:12 +00:00
TreeHugger Robot
d42032e5e2 Merge "Appropriately sets all installs on *any* failure of one" into qt-dev 2019-05-29 15:57:53 +00:00
Jaewoong Jung
0fc171c6a6 Convert PrintRecommendationService to Android.bp.
See build/soong/README.md for more information.

Bug: 122332340
Test: Built and flashed to a Pixel device + TreeHugger
Merged-In: I4ff0577a0c27b8a451e6aca2c62c2437481c2a0c
Change-Id: I4ff0577a0c27b8a451e6aca2c62c2437481c2a0c
2019-05-29 08:41:03 -07:00
Anton Hansson
288b628cf7 Merge "Fix AppFuseMountScope.close()" into qt-dev
am: ab09bd96ac

Change-Id: Iec226c8af1e52a75ada79f3a1fb420b8f7dbbc66
2019-05-29 08:33:20 -07:00
Anton Hansson
ab09bd96ac Merge "Fix AppFuseMountScope.close()" into qt-dev 2019-05-29 15:25:18 +00:00
Abhijeet Kaur
1cceacc469 Merge "Add dark theme for Shell app." into qt-dev
am: 190e99cf3a

Change-Id: I5e0d09befb3d1d45176a8826b4710f001e6fdce3
2019-05-29 07:17:36 -07:00
TreeHugger Robot
190e99cf3a Merge "Add dark theme for Shell app." into qt-dev 2019-05-29 14:03:55 +00:00
Anton Hansson
be9c990019 Fix AppFuseMountScope.close()
The boolean tracking whether the scope had been opened or not
was never set before. Set it in open(), as was the case in the
previous (non-binder) version of this class.

Bug: 132901939
Test: monitor `adb shell mount` while browsing photos and
      verify the appfuse mounts don't build up over time
Change-Id: Ia164ac4209126ed7e4d273c5fca4ababc0c66f2a
2019-05-29 14:43:23 +01:00
Stevie Kideckel
2144371752 Merge "Make statusBarColor and navBarColor transparent for Theme.DeviceDefault.Settings" into qt-dev
am: 75d5091eb3

Change-Id: I6c9c149fc45ddcfdb831bec21db9895b6d209205
2019-05-29 06:42:28 -07:00
Beverly
1feff71387 Change suppresible type of voice comm signalling
USAGE_VOICE_COMMUNICATION_SIGNALLING shouldn't be considered
SUPPRESSIBLE_SYSTEM. It includes the ring tone sound when in a call.
Instead, it should not be suppressible like USAGE_VOICE_COMMUNICATION.

Test: manual
Fixes: 131756661
Change-Id: Ide8aafafe58c421f3b699e6de9358b4e73ad01c5
2019-05-29 13:36:12 +00:00
Stevie Kideckel
75d5091eb3 Merge "Make statusBarColor and navBarColor transparent for Theme.DeviceDefault.Settings" into qt-dev 2019-05-29 13:35:00 +00:00
Matt Pietal
fab9e188e0 Sharesheet - Add additional checks for low ram devices
am: 030bd8471f

Change-Id: I23f2fd79c87d384c26df65e454751fc54b1dda2b
2019-05-29 06:18:22 -07:00
Chalard Jean
5e8cf1bb88 Merge "Add a common test library." am: 9690384221
am: 4343cf32aa

Change-Id: I6104a1a677cb2e4978f11be32dfc604ee431d009
2019-05-29 05:38:21 -07:00
Chalard Jean
4343cf32aa Merge "Add a common test library."
am: 9690384221

Change-Id: I39702b09925304a619c4d4f94435c965078dee8f
2019-05-29 05:32:13 -07:00
Chalard Jean
9690384221 Merge "Add a common test library." 2019-05-29 12:16:08 +00:00
Matt Pietal
030bd8471f Sharesheet - Add additional checks for low ram devices
Continue to hide the direct share area for low ram devices. Make sure
the A-Z list loads properly.

Bug: 132342311
Test: Use low ram device
Change-Id: I66b58af3994e034e4d870286ef62ba4a9289e083
2019-05-29 07:17:39 -04:00
Lorenzo Colitti
1419b0b20e Add one more test for VPN usage stats.
Covers the case where the majority of traffic through the VPN is
caused by the VPN app itself, and ensures that that traffic is
correctly attributed to the VPN app as opposed to spread between
the other apps that use the VPN.

Bug: 120145746
Test: atest NetworkStatsServiceTest
Change-Id: Iffd3f95fc2e11d311691a797b010edb38d2ef3c6
2019-05-29 19:57:43 +09:00
Luke Huang
e8eaaa70d0 Merge "Minor changes for DnsUtils and its test" am: 8c4ef95cbb
am: dfda15715d

Change-Id: Ic1990922e599884582606d1a4d7da3950200d25c
2019-05-29 03:33:34 -07:00
Neil Fuller
e2f20dbca1 [automerger skipped] Merge "Switch to HexEncoding from ByteStringUtils" am: b4cc036c1e
am: 82248bfdd2 -s ours
am skip reason: change_id I6ee12e9914503a5b628ae6da82a396aa71dd972c with SHA1 3bebef5184 is in history

Change-Id: Ieb4a652de31fe3c490ed2faa72919b31b7ff0782
2019-05-29 03:32:05 -07:00
Luke Huang
dfda15715d Merge "Minor changes for DnsUtils and its test"
am: 8c4ef95cbb

Change-Id: Id49e8f1289071ce7f97d72868907e0e3284d411e
2019-05-29 03:28:17 -07:00
Neil Fuller
82248bfdd2 Merge "Switch to HexEncoding from ByteStringUtils"
am: b4cc036c1e

Change-Id: Ie8fc4305f67071242140a1d066ae1c8993820923
2019-05-29 03:26:56 -07:00
Luke Huang
8c4ef95cbb Merge "Minor changes for DnsUtils and its test" 2019-05-29 10:17:24 +00:00
Neil Fuller
b4cc036c1e Merge "Switch to HexEncoding from ByteStringUtils" 2019-05-29 10:12:27 +00:00
Neil Fuller
6ae67f8574 Switch to HexEncoding from ByteStringUtils
Migration in preparation for deletion of ByteStringUtils.

This change also fixes some import issues necessary for upload.

Bug: 124232146
Test: build only
Exempt-From-Owner-Approval: Already approved internally
Merged-In: I6ee12e9914503a5b628ae6da82a396aa71dd972c
Change-Id: I6ee12e9914503a5b628ae6da82a396aa71dd972c
2019-05-29 10:11:44 +00:00
Steven Kideckel
10b4dbb190 Make statusBarColor and navBarColor transparent for
Theme.DeviceDefault.Settings

Bug: 133474669
Test: manual - compared effects in apps using the theme on my device
Change-Id: Ia37f3e216a1b42d8d49f2c08d29c9e1ce835fdfb
2019-05-29 09:49:00 +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
Mathew Inwood
2e88159d1e Merge "Greylist 3P packages in the bootclasspath." into qt-dev
am: 2cf040d602

Change-Id: Iab1cc2ea618ffd8d5a1ceabe06b7698825011248
2019-05-29 00:13:53 -07:00
Mathew Inwood
2cf040d602 Merge "Greylist 3P packages in the bootclasspath." into qt-dev 2019-05-29 07:00:23 +00:00
Arthur Hung
8201bb3ad6 Merge "Fix a deadlock between WindowManagerGlobal and WindowManagerService" into qt-dev
am: 99d4417d4f

Change-Id: I99ad47e8e92f4831f6434e3952661849e55004c1
2019-05-28 23:03:59 -07:00
TreeHugger Robot
99d4417d4f Merge "Fix a deadlock between WindowManagerGlobal and WindowManagerService" into qt-dev 2019-05-29 06:00:15 +00:00
Feng Cao
d272fe2950 Merge "Fix clipboard permission issue for AugmentedAutofillService provider." into qt-dev
am: 3c0eeb951f

Change-Id: I0a54efe3583720c9d4d70731c248b6117ac073b1
2019-05-28 22:58:57 -07:00
Luke Huang
9f97f97d0d Minor changes for DnsUtils and its test
fix nits for ag/7671031

Bug: 129530368
Test: atest DnsUtilsTest
Change-Id: I562d33870a933a5fe55c89137a2d9574e3c59b90
2019-05-29 13:56:27 +08:00
Feng Cao
3c0eeb951f Merge "Fix clipboard permission issue for AugmentedAutofillService provider." into qt-dev 2019-05-29 05:53:39 +00:00
Alex Salo
7ba03c7f76 Merge "Don't run AttentionDetector when wakelock is held" into qt-dev
am: ed8620ae02

Change-Id: I0e6767143f3f7c0bedc90a15400055a062c3c90f
2019-05-28 22:09:29 -07:00
Tracy Zhou
279e47ff19 Merge "Hide floating rotation button upon click" into qt-dev
am: 8f5770a0b3

Change-Id: I6567861faf3c98127b463ba6314a69b17b592ba4
2019-05-28 22:07:48 -07:00
TreeHugger Robot
ed8620ae02 Merge "Don't run AttentionDetector when wakelock is held" into qt-dev 2019-05-29 04:56:52 +00:00