Lucas Dupin
13100c09ea
Merge "WallpaperColors hint computation" into pi-dev
...
am: 29d047bab8
Change-Id: I120590fe320065573eafa32fbf6ab4807495dc11
2018-03-06 22:45:35 +00:00
TreeHugger Robot
29d047bab8
Merge "WallpaperColors hint computation" into pi-dev
2018-03-06 22:16:50 +00:00
Jeffrey Vander Stoep
c6667aada1
Merge "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion"" into pi-dev
...
am: 1d03b9489e
Change-Id: I1fcbe7768bc34528b900dd47218fedc7d06ce661
2018-03-06 20:59:08 +00:00
TreeHugger Robot
1d03b9489e
Merge "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion"" into pi-dev
2018-03-06 20:14:26 +00:00
Remi NGUYEN VAN
d2832e320b
Merge "Allow null subscriberId in NetworkStatsManager." am: 6bd13af46a
...
am: a6905db1d8
Change-Id: I1e4e283c6eaecf33d12488e41e0c524f6ff83954
2018-03-06 19:52:57 +00:00
Andrew Grieve
e7bb5673fe
Merge "Expose Process.isIsolated()" into pi-dev
...
am: 6ddf443d15
Change-Id: I02cb0a0bb503201ea4b4e9ca4961e5687a51e6d8
2018-03-06 19:45:12 +00:00
Remi NGUYEN VAN
a6905db1d8
Merge "Allow null subscriberId in NetworkStatsManager."
...
am: 6bd13af46a
Change-Id: I900ac14224284fc3a1422e8791bc54d6a9ee77ba
2018-03-06 19:37:13 +00:00
TreeHugger Robot
6ddf443d15
Merge "Expose Process.isIsolated()" into pi-dev
2018-03-06 19:20:47 +00:00
Lucas Dupin
106df024b6
Merge "WallpaperColors.fromDrawable Drawable mutation" into pi-dev
...
am: 1c6e3ba66d
Change-Id: I75f1594b938679919d531ff9b27b43e0a59a433d
2018-03-06 17:56:39 +00:00
Lucas Dupin
1c6e3ba66d
Merge "WallpaperColors.fromDrawable Drawable mutation" into pi-dev
2018-03-06 17:34:48 +00:00
Andrew Grieve
0fec93682e
Expose Process.isIsolated()
...
Rather than have a process attempt to perform IO / IPC and check if it
fails, it makes much more sense to expose this getter.
My specific motivation for exposing this information more directly is to
be able to perform process-specific initialization logic in
Application.attachBaseContext():
https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java?rcl=ac2e180a1265f88dd4030bb35d69f5d0b2dc488d&l=54
Bug: 73343822
Test: Same code that's used in Chrome via reflection.
Change-Id: I1505962679da36ac42401230b204bff7b3376b73
2018-03-06 17:17:43 +00:00
Tony Mak
6a6e20a432
Merge "Revert accidental change of isUsingUnifiedPassword javadoc" into pi-dev
...
am: bf8137a7cd
Change-Id: I219b1d9246f4845e0d0100fd1490b3e2155caf32
2018-03-06 15:46:32 +00:00
TreeHugger Robot
bf8137a7cd
Merge "Revert accidental change of isUsingUnifiedPassword javadoc" into pi-dev
2018-03-06 15:23:18 +00:00
Jeffrey Vander Stoep
85d1b5c414
Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion"
...
This reverts commit 8196fd9380 .
Reason for revert: b/74214574
Bug: 74214574
Change-Id: I9602872238ccc8a49d8b200e5389995d597f1c3a
(cherry picked from commit 00b4fa8b13 )
2018-03-06 15:12:15 +00:00
Mathew Inwood
a9c56d53e6
Merge "Don't whitelist all system image apps." into pi-dev
...
am: 3fbc54e609
Change-Id: I6eef88e7080c8c599494448b640ba0284cb30f6d
2018-03-06 12:07:30 +00:00
TreeHugger Robot
3fbc54e609
Merge "Don't whitelist all system image apps." into pi-dev
2018-03-06 11:50:23 +00:00
Tony Mak
6a97535f28
Revert accidental change of isUsingUnifiedPassword javadoc
...
Test: None
Change-Id: I72735b790ae37838917b2330b84a3cfef32ce7b8
2018-03-06 11:34:08 +00:00
Mathew Inwood
6827f4a2c8
Don't whitelist all system image apps.
...
Also include in system dump which packages are exempt from the api
restrictions.
This is a cherry-pick of 974290b032
from master.
Test: Verified that the device boots.
Bug: 64382372
Change-Id: Iaeca91478f53c8b4e9608246aab42bdb90f899bb
2018-03-06 09:54:55 +00:00
Insun Kang
f3e9ee6587
Merge "VideoView2: Move MediaContolView2's hidden constant" into pi-dev
...
am: 27ed96bf0c
Change-Id: I754bda631577db7179f0d7811b75a26a8a9c392a
2018-03-06 08:59:05 +00:00
Mike Ma
eece6eb9df
Merge "Power profile audio & video support" into pi-dev
...
am: 1ab03020db
Change-Id: I073bc1f1ab6ff7be692df042b94e05cba42eea2d
2018-03-06 08:33:57 +00:00
TreeHugger Robot
27ed96bf0c
Merge "VideoView2: Move MediaContolView2's hidden constant" into pi-dev
2018-03-06 07:55:14 +00:00
TreeHugger Robot
1ab03020db
Merge "Power profile audio & video support" into pi-dev
2018-03-06 07:44:28 +00:00
Erik Kline
a69df717ce
Merge "Fail if the interface is not available when starting" into pi-dev
2018-03-06 05:53:29 +00:00
Insun Kang
7c5b02dff8
VideoView2: Move MediaContolView2's hidden constant
...
Bug: 74173212
Test: VideoViewTest app
Change-Id: Ic91e0b0bfb910d555c1dbe77f028a017f2a18b79
(cherry picked from commit a0fdcc97f0 )
2018-03-06 05:51:56 +00:00
Remi NGUYEN VAN
489e8b02f8
Allow null subscriberId in NetworkStatsManager.
...
Use a MATCH_MOBILE_WILDCARD template to avoid filtering by
subscriberId when querying statistics from NetworkStatsService.
Bug: 74038898
Change-Id: I4b39e7031416cb33b23d89aa36ff0f774eaa942f
Fixes: 74038898
Test: runtest frameworks-net, CTS tests pass
2018-03-06 13:28:19 +09:00
TreeHugger Robot
faf6589748
Merge "Bluetooth: Use enums for adapter connection states" into pi-dev
2018-03-06 03:33:42 +00:00
Erik Kline
ea1b8bd5a5
Fail if the interface is not available when starting
...
Addresses a long-standing TODO. Now, when calling IpClient's
startProvisioning(), the interface has to be available (i.e.
InterfaceParams#getByName() must return non-null).
Also:
- add a test
- refactor for testability
- delete some constructors no longer used
- properly handle passed-in null IpClient.Callback
- some more IpManager -> IpClient renaming
- permit recording metrics before starting a provisioning
attempt (logging immediate errors) without Log.wtf().
Test: as follows
- built
- flashed
- booted
- runtest frameworks/opt/net/wifi/tests/wifitests/runtests.sh passes
- runtest frameworks-net passes
- basic WiFi IpClient connections works fine
Bug: 62476366
Bug: 73487570
Merged-In: I68e5e24122dc31e730cdbe8d75e33847e6332da4
Merged-In: Ifd27f5d908947cd7b4e1b8d54f9fa87e43ebb11b
Merged-In: Ief3c8e1652f69af0276fe35946ae1bf6e6b1b57e
Change-Id: Ic83ad2a65637277dcb273feb27b2d1bb7a11eb2b
(cherry picked from commit b152cd0aa4 )
2018-03-06 11:06:34 +09:00
Mike Ma
07305c0b46
Power profile audio & video support
...
Add power consumed by audio and video hardware to power profile.
Attribute these power to specific app.
Bug: 70531798
Test: PowerProfileTest
Test: BatteryStatsHelperTest
Test: PowerCalculatorTest
Change-Id: I4811efa14ce97983258cd59bfd328181fe95baf4
2018-03-05 18:06:29 -08:00
Jack He
bd020a6f5a
Bluetooth: Use enums for adapter connection states
...
Bug: 69478930
Test: make, no user visible change
Change-Id: I999d0c445fe3b24aca72961c40c3428901542bc1
(cherry picked from commit ee81f99150 )
2018-03-05 17:27:05 -08:00
Fyodor Kupolov
d4315862cc
Merge "Revert "Allow restoring of apps that rotated key"" into pi-dev
...
am: d97a0f1ac5
Change-Id: Ide1400a320ec6f3d5428fdfffae613d15319afe3
2018-03-06 01:25:42 +00:00
Jack He
775c458d40
Merge "Bluetooth: Use enums for adapter connection states" am: 95372e873e
...
am: 8da4504cad
Change-Id: I7e0ed2b7a0b67bb443b9e104a7985e3a9bed96ff
2018-03-06 01:17:15 +00:00
Tony Mak
b3ef16b002
Merge "Improve javadocs of some DPM APIs" into pi-dev
...
am: 889cf2e00d
Change-Id: I39e374287a4c37dfd644e5b4292f0801070ce6ad
2018-03-06 01:03:14 +00:00
Jack He
8da4504cad
Merge "Bluetooth: Use enums for adapter connection states"
...
am: 95372e873e
Change-Id: Iab73a463f99de6113146b6541babe95b512ebbfa
2018-03-06 01:02:52 +00:00
Fyodor Kupolov
d97a0f1ac5
Merge "Revert "Allow restoring of apps that rotated key"" into pi-dev
2018-03-06 00:28:51 +00:00
Treehugger Robot
95372e873e
Merge "Bluetooth: Use enums for adapter connection states"
2018-03-05 23:16:21 +00:00
Treehugger Robot
84bda3a709
Merge "DO NOT MERGE Dummy StatsLog class"
2018-03-05 23:14:48 +00:00
Amith Yamasani
14c716c911
Revert "Allow restoring of apps that rotated key"
...
This reverts commit 313d225cd1 .
Reason for revert: b/74159113
Change-Id: I483ecdd80d26fca8451cd270b4fcbe34379839cb
2018-03-05 20:40:23 +00:00
Tony Mak
329047bd16
Improve javadocs of some DPM APIs
...
FIX: 70332970
FIX: 73919570
FIX: 67495520
FIX: 71566404
Test: None
Change-Id: Ic9b485ff7c15e0d244cba9e71def8d5c41e52070
(cherry picked from commit 8309c8f760 )
2018-03-05 20:21:57 +00:00
Jack He
ee81f99150
Bluetooth: Use enums for adapter connection states
...
Bug: 69478930
Test: make, no user visible change
Change-Id: I999d0c445fe3b24aca72961c40c3428901542bc1
2018-03-05 11:23:31 -08:00
Adrian Roos
573b1d11a6
DisplayCutout API: Make constructor public and adjust javadoc
...
am: 9bbd9661c0
Change-Id: Ia8cff9659b65e03a4a03af7f28939fa1712a2cb2
2018-03-05 18:34:50 +00:00
Lucas Dupin
ffbf37e611
WallpaperColors.fromDrawable Drawable mutation
...
WallpaperColors.fromDrawable should never mutate Drawable bounds
Test: tests/app/src/android/app/cts/WallpaperColorsTest.java
Change-Id: I7467033c6a4e587b04e60423ceec3404b980cdf2
Fixes: 73506557
2018-03-05 17:27:28 +00:00
Lucas Dupin
c50f47d970
WallpaperColors hint computation
...
Public WallpaperColors surface should not compute hints, malicious apps
might use theme inversion to slow down the system.
Change-Id: I9d14259e433b1047d2512b3d994524dca5e8531a
Fixes: 69532159
Test: set white wallpaper, black wallpaper, observe theme changing
Test: runtest -x services/tests/servicestests/src/com/android/server/wallpaper/WallpaperServiceTests.java
2018-03-05 17:26:58 +00:00
Erik Kline
f5af0cede5
Merge "Fail if the interface is not available when starting" am: b331b02da9
...
am: a1f407d0f5
Change-Id: Ifd27f5d908947cd7b4e1b8d54f9fa87e43ebb11b
2018-03-05 15:13:01 +00:00
Erik Kline
a1f407d0f5
Merge "Fail if the interface is not available when starting"
...
am: b331b02da9
Change-Id: If9a8b1bc88b7358919d67f0ebaf01115bd1af69e
2018-03-05 15:05:08 +00:00
Adrian Roos
9bbd9661c0
DisplayCutout API: Make constructor public and adjust javadoc
...
Change-Id: I093cf4f9ea60f00e187aeb4a548f3f5789d87fa1
Fixes: 73953880
Test: make update-api
(cherry picked from commit d61db603fe )
2018-03-05 13:52:32 +00:00
Erik Kline
b331b02da9
Merge "Fail if the interface is not available when starting"
2018-03-05 12:39:28 +00:00
Lorenzo Colitti
28e229b85e
Merge "Add DNS_TETHER to the list of UIDs in the framework." am: 0b8d55e633
...
am: c64dc7c632
Change-Id: Ie73be466fe9ace9a3ca8d8d7594ad41967186261
2018-03-05 12:23:35 +00:00
Erik Kline
b152cd0aa4
Fail if the interface is not available when starting
...
Addresses a long-standing TODO. Now, when calling IpClient's
startProvisioning(), the interface has to be available (i.e.
InterfaceParams#getByName() must return non-null).
Also:
- add a test
- refactor for testability
- delete some constructors no longer used
- properly handle passed-in null IpClient.Callback
- some more IpManager -> IpClient renaming
- permit recording metrics before starting a provisioning
attempt (logging immediate errors) without Log.wtf().
Test: as follows
- built
- flashed
- booted
- runtest frameworks/opt/net/wifi/tests/wifitests/runtests.sh passes
- runtest frameworks-net passes
- basic WiFi IpClient connections works fine
Bug: 62476366
Bug: 73487570
Change-Id: Ic83ad2a65637277dcb273feb27b2d1bb7a11eb2b
2018-03-05 19:29:26 +09:00
Lorenzo Colitti
c64dc7c632
Merge "Add DNS_TETHER to the list of UIDs in the framework."
...
am: 0b8d55e633
Change-Id: I2162a009968c1bcfbfc32a41f14c0e7cad81a8a7
2018-03-05 09:46:59 +00:00
Treehugger Robot
0b8d55e633
Merge "Add DNS_TETHER to the list of UIDs in the framework."
2018-03-05 07:40:36 +00:00