Commit Graph

81371 Commits

Author SHA1 Message Date
Bryce Lee
94795bcaf8 Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev am: 33d4702a12
am: 05865fb40a

Change-Id: Ia5817040ce14ee6dbd995bd83444f34e78bef375
2017-07-31 18:53:39 +00:00
Bryce Lee
05865fb40a Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
am: 33d4702a12

Change-Id: I990a3554730cc07440c7d4bc0236e0aeb00e2980
2017-07-31 18:46:20 +00:00
Seigo Nonaka
0494dc5d17 Merge "Stop font loading with restricted context." into oc-mr1-dev
am: 06ba486a74

Change-Id: I0c668e01f9fe254b6bedace52d19bd7bcb5d5f1f
2017-07-31 18:36:49 +00:00
TreeHugger Robot
06ba486a74 Merge "Stop font loading with restricted context." into oc-mr1-dev 2017-07-31 18:23:04 +00:00
Makoto Onuki
bc939bbe7c Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
am: bb77e6c689

Change-Id: Ia47cf7d0832ef6ca99b4f4991c2e2624bdf03742
2017-07-31 18:03:17 +00:00
TreeHugger Robot
bb77e6c689 Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev 2017-07-31 17:52:41 +00:00
Bryce Lee
658d984f04 Do not call onConfigurationChanged for appBound position changes.
Since appBounds encodes both dimensions and positions, movement will
cause a diff change. This happens in situations where the dimensions
stay constant, such as dragging a PiP window around.

To avoid flooding the client side with configuration changes, this CL
checks whether the new configuration is equivalent to the existing
configuration with the exception of the position of the appBounds
before sending to the registered callbacks.

Change-Id: I8fbc94458fd9ed3b39494c3587f25e704ec02a7d
Fixes: 63927944
Test: bit FrameworksServicesTests:com.android.server.wm.AppBoundsTests
Test: go/wm-smoke
2017-07-31 08:46:00 -07:00
Selim Gurun
e8315ab4d7 Merge "Update documentation for Whitelist API" into oc-mr1-dev
am: a30ec5ff4c

Change-Id: I28b1d260e9daf408a71494e054dba59954ef926b
2017-07-31 14:35:22 +00:00
Selim Gurun
a30ec5ff4c Merge "Update documentation for Whitelist API" into oc-mr1-dev 2017-07-31 14:27:52 +00:00
Yohei Yukawa
5eca35d4a0 Merge "Remove a compat hack SurfaceView#setWindowType()" into oc-mr1-dev
am: f678eaad89

Change-Id: I690e4fe17fcbceab3488c40dce2baec9cc97a3e7
2017-07-31 07:15:26 +00:00
Yohei Yukawa
7a1ad6d97c Remove a compat hack SurfaceView#setWindowType()
This CL logically reverts a compatibility hack I introduced [1] for
apps that had relied on @hide method SurfaceView#setWindowType(int).

 [1]: I5217f6417a73690ae8a978754218b7b089070fdd
      3b5011afc9

Fixes: 62054282
Test: Manually verified that Bug 36345857 is still not reproducible
Change-Id: Icee198c554de558cfa4ffe0b264064969839654e
2017-07-30 20:54:08 -07:00
Jeff Sharkey
284eab179c Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev
am: 2c131cafae

Change-Id: I1f1d834712004b520a02d3116de945c668236f81
2017-07-30 00:15:17 +00:00
TreeHugger Robot
2c131cafae Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev 2017-07-30 00:09:04 +00:00
Lucas Dupin
bba6a4c9df Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev am: f98facc3b8
am: 58d7a76e8d

Change-Id: Ie155db391504fc788036c2a9defae375b6a0b510
2017-07-29 23:24:29 +00:00
Lucas Dupin
835f5e41de Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
am: f98facc3b8

Change-Id: I4c4eb814d8ea2152644665daf6fbd6eb28d81b06
2017-07-29 23:17:49 +00:00
Lucas Dupin
58d7a76e8d Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
am: f98facc3b8

Change-Id: Iab836083f7e3ea86263de1a1d2a2d69d7e25fe73
2017-07-29 23:17:49 +00:00
TreeHugger Robot
f98facc3b8 Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev 2017-07-29 23:08:04 +00:00
Vinay Kalia
0fc48f2d37 Merge "Fix BLE scan leaks" into oc-dr1-dev am: 604a4b7171
am: 7d06d7bd79

Change-Id: I54ff5a6a0ccc29a2e4acb9983c0610f18c9f7950
2017-07-29 22:24:24 +00:00
Vinay Kalia
b7e2c50214 Merge "Fix BLE scan leaks" into oc-dr1-dev
am: 604a4b7171

Change-Id: I65e4990a08cc59ce30ee6d987f13a0381b42e58f
2017-07-29 22:17:06 +00:00
Vinay Kalia
7d06d7bd79 Merge "Fix BLE scan leaks" into oc-dr1-dev
am: 604a4b7171

Change-Id: I9e3f7a0d3b871e5c5e2a740ec69eacaa2cbc41e2
2017-07-29 22:17:03 +00:00
TreeHugger Robot
604a4b7171 Merge "Fix BLE scan leaks" into oc-dr1-dev 2017-07-29 22:08:36 +00:00
Hugo Benichi
0cad8d2e14 Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 6e269ec6fe
am: 6992f4edb3

Change-Id: Iec6d92e9a3a12bab87c5adfaf17f776465077060
2017-07-29 00:03:27 +00:00
Hugo Benichi
359f2215eb Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev
am: 6e269ec6fe

Change-Id: I165a8bbe8362100f1e2bb909459fb45b1c68d5ae
2017-07-28 23:54:05 +00:00
Hugo Benichi
6992f4edb3 Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev
am: 6e269ec6fe

Change-Id: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
2017-07-28 23:54:03 +00:00
Hugo Benichi
6e269ec6fe Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev 2017-07-28 23:42:59 +00:00
Vinay Kalia
9722971cb4 Fix BLE scan leaks
If an app starts multiple scans with same callback then
there is a collision in mLeScanClients hash map which
results in leaking first scan. This change fixes it by
not allowing the second scan with same callback.

BUG: 62389939
BUG: 38198694

Test: Tested applications which started multiple scans with
       same callback.

Change-Id: I569069a40b6f8b4b8bb070731225e732c6b23ec8
2017-07-28 23:39:15 +00:00
Jeff Sharkey
b7479988d2 Migrate plans to @SystemApi, evolve permissions.
We're not yet ready to commit to SubscriptionPlan as public API, so
relax to be @SystemApi instead.  Add a new MANAGE_SUBSCRIPTION_PLANS
permission that we require apps to hold, unless they've been
delegated access via a trusted CarrierService.

Since several apps have the ability to provide plans for a single
subId, we now remember the "owner" who set the current plan
information, and we refuse to leak plan information beyond the app
that originally set it.

Relax permissions check to not require READ_PHONE_STATE, since we're
only returning data that an app provided to us earlier.  Also fix
NPE when SubscriptionInfo is missing.

Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug: 63997177, 63928277, 64156138, 63903381
Change-Id: If503378ef406dcaec438c9b41e837e0a821a3ef4
2017-07-28 16:59:14 -06:00
Sergey Vasilinets
98e73b856a Merge "Revert "Revert "Update overscroll and toast UI""" into oc-dr1-dev am: 2cf8f91637
am: 3c9c422d33

Change-Id: Ib205afb1f70decc66c13b2758eb0e31cd8951ddf
2017-07-28 22:36:57 +00:00
Makoto Onuki
e86a29c6e6 Reduce duplicate strings due to the package cache.
The following charts are the actual measurement with and without the fix,
using "dumpsys system".
- The red bar is "total private dirty".
- The X axsis is time since boot.

Without fix:
- First boot:
https://docs.google.com/spreadsheets/d/1R6lL0AnAp93HnrqWujJFNgOjj6wvGicgDlbDAevbc3g/edit#gid=0
Private dirty stabilizes at ~16.8M.

- Second boot:
https://docs.google.com/spreadsheets/d/1R6lL0AnAp93HnrqWujJFNgOjj6wvGicgDlbDAevbc3g/edit#gid=1918404197
Private dirty stabilizes at ~17.8M.

With fix:
- First boot:
https://docs.google.com/spreadsheets/d/1R6lL0AnAp93HnrqWujJFNgOjj6wvGicgDlbDAevbc3g/edit#gid=791764875
Private dirty stabilizes at ~17.0M.

- Second boot:
https://docs.google.com/spreadsheets/d/1R6lL0AnAp93HnrqWujJFNgOjj6wvGicgDlbDAevbc3g/edit#gid=1820894299
Private dirty stabilizes at ~17.0M.

Test: build, boot, reboot, adb-install, reboot
bit FrameworksCoreTests:android.content.pm.PackageParserTest

Bug: 64112468
Change-Id: I5ae9c1b2d021fe62526d4e0dd1a52a962b48206e
2017-07-28 15:09:13 -07:00
Sergey Vasilinets
3c9c422d33 Merge "Revert "Revert "Update overscroll and toast UI""" into oc-dr1-dev
am: 2cf8f91637

Change-Id: Ia0f4dc6193776e0b37eb7e2d2048918510cae535
2017-07-28 22:02:14 +00:00
Sergey Vasilinets
8a3dff0d86 Merge "Revert "Revert "Update overscroll and toast UI""" into oc-dr1-dev
am: 2cf8f91637

Change-Id: I21fe41861a98f87e035bce64c406040cb088b356
2017-07-28 21:58:35 +00:00
Bryce Lee
96d54d41f4 Merge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev am: 5b76ce1b2b
am: d6dfd4a8b4

Change-Id: I38aeed5d2ab2cf7932e98e97800fa1cd73c7a3ec
2017-07-28 21:47:21 +00:00
Sergey Vasilinets
2cf8f91637 Merge "Revert "Revert "Update overscroll and toast UI""" into oc-dr1-dev 2017-07-28 21:46:43 +00:00
Benjamin Miller
7a446355df Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev am: 91f16ace4f am: c058675b80
am: 2c2d19504c

Change-Id: Icfc58e983492adcb84d51208e0a8e276768d7e24
2017-07-28 21:29:27 +00:00
Bryce Lee
84fa183e7d Merge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev
am: 5b76ce1b2b

Change-Id: Ibf899e9a08cdab31ae38897add813fc4c8089474
2017-07-28 21:28:05 +00:00
Benjamin Miller
ae4b64ab41 Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev am: 91f16ace4f
am: 5934ae605a

Change-Id: Ia4c07afe64fd3a0a743790f1e1284bdc1db0f4c5
2017-07-28 21:15:41 +00:00
Selim Gurun
89e935904a Update documentation for Whitelist API
Bug: 64144913
Test: compile documentation and visually confirm

Change-Id: Ia19ca9b6cf4f8a0802835d597a30e10c498dbd81
2017-07-28 12:06:42 -07:00
Bryce Lee
d6dfd4a8b4 Merge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev
am: 5b76ce1b2b

Change-Id: I8386f0693d79708b4d32bb7108139a75e273eeb1
2017-07-28 18:18:52 +00:00
Bryce Lee
5b76ce1b2b Merge "Remove rotation and app bounds from Configuration diff." into oc-dr1-dev 2017-07-28 17:57:09 +00:00
Benjamin Miller
2c2d19504c Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev am: 91f16ace4f
am: c058675b80

Change-Id: Ib052cafb46a2e7830a7573c8a112147bc821cf0c
2017-07-28 17:39:42 +00:00
Benjamin Miller
5934ae605a Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
am: 91f16ace4f

Change-Id: Id7d2c62577e0b534a7dd6605f722e7c5639e46b7
2017-07-28 17:30:18 +00:00
Benjamin Miller
c058675b80 Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
am: 91f16ace4f

Change-Id: I9dd5d6641307589250d781dce11c4f2186b3c8fb
2017-07-28 17:30:16 +00:00
TreeHugger Robot
91f16ace4f Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev 2017-07-28 17:11:28 +00:00
Lucas Dupin
9324aa926a Scrim opacity must satisfy GAR
Change-Id: Ic0a2423d73f0a3439a0dc4de8eb6e4719dbf36e1
Fixes: 63365056
Test: runtest -x tests/Internal/src/com/android/internal/graphics/ColorUtilsTest.java
2017-07-28 10:07:04 -07:00
Svetoslav Ganov
bd0cf0ab06 Merge "Report permission flags for all protections based on SDK am: adb8c522a8 am: fc862c9f86" into oc-dr1-dev-plus-aosp
am: bccc7625ec

Change-Id: Idf1e289d5e70246433e5eccf286026b48e57282f
2017-07-28 17:06:59 +00:00
Svetoslav Ganov
899f54da72 Report permission flags for all protections based on SDK am: adb8c522a8
am: 436b901dbb

Change-Id: Ibe7cecd60242f1895434d586af30c2081d451f0b
2017-07-28 16:59:55 +00:00
Svetoslav Ganov
70ec94fd12 Report permission flags for all protections based on SDK am: adb8c522a8
am: fc862c9f86

Change-Id: Ie08845d6e5afa8f75e1cc5392a1f5c2166d06d20
2017-07-28 16:54:06 +00:00
Svetoslav Ganov
436b901dbb Report permission flags for all protections based on SDK
am: adb8c522a8

Change-Id: Ia30269ec2097d5978ae3e0b3930a38b3f4441ea4
2017-07-28 16:42:59 +00:00
Svetoslav Ganov
fc862c9f86 Report permission flags for all protections based on SDK
am: adb8c522a8

Change-Id: I259df147b8345f6bdba5a1ed31d01d3c42e90518
2017-07-28 16:42:09 +00:00
Geoffrey Pitsch
ed4d540a65 Merge "Revert "Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev"" into oc-mr1-dev
am: a6b8e4503e

Change-Id: If84b854fc446b83a6b62cb750b8e221c220170bc
2017-07-28 15:35:44 +00:00