Commit Graph

82353 Commits

Author SHA1 Message Date
Winson Chung
ec1e188e67 Merge "Add windowing mode to task snapshot." into pi-dev
am: 167710981c

Change-Id: I0348be9f7e096e7effc1476f5015d33263a163fe
2018-04-23 15:30:23 -07:00
Winson Chung
167710981c Merge "Add windowing mode to task snapshot." into pi-dev 2018-04-23 22:16:01 +00:00
Sudheer Shanka
ec9e20a1d9 Merge "Rate limit battery external stats collection in takeUidSnapshot(s)." into pi-dev
am: 6bc6e21be7

Change-Id: I50eba3f8c2171c511e0b1ecd3d0e605956e97d24
2018-04-23 14:52:01 -07:00
Sudheer Shanka
6bc6e21be7 Merge "Rate limit battery external stats collection in takeUidSnapshot(s)." into pi-dev 2018-04-23 21:34:57 +00:00
Victor Hsieh
a81b3fec24 Merge "Verify best signature algorithms of all signers" into pi-dev
am: c17a171a7b

Change-Id: I05d0dd847c93fdcd594880bc7743fe31a55d2855
2018-04-23 14:26:41 -07:00
Rob Carr
c595c5c044 Merge "ViewRoot: Check Surface validity before initializing renderer from draw()." into pi-dev
am: cef96f69d7

Change-Id: I3d7857f31bfe9bba3bde78bef67f08c7b24338c6
2018-04-23 12:43:23 -07:00
Winson Chung
a4fa8d5bd4 Add windowing mode to task snapshot.
Bug: 78155683
Test: atest FrameworksServicesTests:TaskSnapshotPersisterLoaderTest
Change-Id: I4e562d818416a30d6759baef37c74b6d9c514a00
2018-04-23 12:25:38 -07:00
Victor Hsieh
8d1553b9b1 Verify best signature algorithms of all signers
The previous implementation does not verify signature algorithms of all
signers.  It's possible that the attacker can take an old apk (with
digest and signature of old algorithm) and add their own signer block
with new/P digest and signature.  In this case, the old implementation
only verifies the attacker's signature, thus the attacker can change apk
content easily.

The solution here is to verify digests of all best signature algorithms
by all signers.

It is expected to increase verification time, if the apk does have
multiple signers with different type of digests.

Test: apks still install
Bug: 78359754
Change-Id: I607edf219c25a2a7adfa27a21a94e9bfefbb6cec
Merged-In: I607edf219c25a2a7adfa27a21a94e9bfefbb6cec
(cherry picked from commit 2f2ced93e3)
2018-04-23 19:22:28 +00:00
Rob Carr
cef96f69d7 Merge "ViewRoot: Check Surface validity before initializing renderer from draw()." into pi-dev 2018-04-23 19:22:18 +00:00
Siyamed Sinir
742c26c07e Merge "Update Emoji.java for emoji 11" into pi-dev
am: 5ee0f5c1d7

Change-Id: Ide0fbd74e531f401b6e3a22b0cb84fb083486994
2018-04-23 11:53:25 -07:00
Sudheer Shanka
e56013aa31 Rate limit battery external stats collection in takeUidSnapshot(s).
Bug: 74146897
Test: atest cts/tests/tests/os/src/android/os/health/cts/SystemHealthManagerTest.java
Test: atest core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: I2e01146718c3ce65d230308097622b958cb2897a
2018-04-23 11:38:36 -07:00
Siyamed Sinir
5ee0f5c1d7 Merge "Update Emoji.java for emoji 11" into pi-dev 2018-04-23 18:19:22 +00:00
Jorim Jaggi
92cb00c2e4 Merge "Remove prolonged animations" into pi-dev
am: 5bdf9530a0

Change-Id: Ie769ceea49d0e1cd877fb3fcb8d78ef08a9b635d
2018-04-23 06:18:02 -07:00
Jorim Jaggi
5bdf9530a0 Merge "Remove prolonged animations" into pi-dev 2018-04-23 12:17:37 +00:00
Jeff Sharkey
64a615eefe Merge "Extend adoptable override to force on or off." into pi-dev
am: 130a2503d8

Change-Id: Ic5bb21ec16f4603d87b5b659f041ee0a08b8d039
2018-04-20 17:20:16 -07:00
Andrii Kulian
33fd905c37 Merge "Don't require post-execution state for onActivityResult" into pi-dev
am: 5007c67a70

Change-Id: I6ea56c0e6e68afd354426194bd0d4536129abe86
2018-04-20 17:10:42 -07:00
Jeff Sharkey
130a2503d8 Merge "Extend adoptable override to force on or off." into pi-dev 2018-04-20 23:24:28 +00:00
Andrii Kulian
5007c67a70 Merge "Don't require post-execution state for onActivityResult" into pi-dev 2018-04-20 23:21:25 +00:00
Jeff Sharkey
77c7b732c4 Merge "Give CTS a way to force-poll network stats." into pi-dev
am: 46e58e1b40

Change-Id: Id2252b803a33ddadfef71618b3b9106c93c5be2a
2018-04-20 13:51:02 -07:00
Julia Reynolds
a643f89ce1 Merge "GetActiveNotifications should never return null" into pi-dev
am: 66dfd01292

Change-Id: Iba293f70adda8e225d8b8c2f84465d95acbb18cf
2018-04-20 13:44:49 -07:00
TreeHugger Robot
46e58e1b40 Merge "Give CTS a way to force-poll network stats." into pi-dev 2018-04-20 20:40:32 +00:00
Julia Reynolds
66dfd01292 Merge "GetActiveNotifications should never return null" into pi-dev 2018-04-20 20:21:41 +00:00
Andrii Kulian
e55b009a3d Don't require post-execution state for onActivityResult
According to the documentation, onActivityResult() should be called
immediately before onResume(). This, however, was not always the case
in previous releases and fixing this caused some app compatibility
issues.
This CL removes required post execution state for ActivityResultItem.

Bug: 77695691
Test: ActivityLifecycleTests
Change-Id: Id8c02e9b49f9758aac616e37948570722d802de8
2018-04-20 12:58:49 -07:00
Jeff Sharkey
901c04270f Extend adoptable override to force on or off.
Virtual disks are adoptable by default, but for debugging purposes
we want to treat them as unadoptable in some cases.  Add the ability
for the "sm" shell command to force on/off, or return to default.

Bug: 77849654, 74132243
Test: manual
Change-Id: Ieda317396624ca081e5dd9568795483f684f9297
2018-04-20 13:11:23 -06:00
Abodunrinwa Toki
f8a770a515 Merge "SmartLinkify - handle keyboard clicks" into pi-dev
am: 686fab1464

Change-Id: I90f3d9ca20c9bb5a5f3c62da061e74d8517b5864
2018-04-20 12:05:24 -07:00
Julia Reynolds
94a38b35e9 GetActiveNotifications should never return null
Test: runtest systemui-notification
Change-Id: I53e7a4a2a9f05318dd97ffb096658a4f8bcebc8a
Fixes: 70396956
2018-04-20 14:46:43 -04:00
TreeHugger Robot
686fab1464 Merge "SmartLinkify - handle keyboard clicks" into pi-dev 2018-04-20 18:44:02 +00:00
Jeff Sharkey
c3c8d16380 Give CTS a way to force-poll network stats.
Collecting network statistics is pretty heavy, which is why we're
throttling callers.  However, to keep CTS running fast, we provide a
way for tests to force a poll event, instead of making them wait for
the throttle timeout.

Bug: 77908520
Test: atest cts/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java
Change-Id: Ia792f0cd495023366ff8c4839df54e7da2ae8331
2018-04-20 12:18:23 -06:00
Adrian Roos
03d4aeda37 Merge "Defer resizing invisible stacks while drag resizing" into pi-dev
am: 5e12ebfffd

Change-Id: I9252974e456740921a5778bd167e115d25e0d7bc
2018-04-20 08:00:08 -07:00
Jorim Jaggi
66b48dfb9e Remove prolonged animations
Didn't work anymore since the animation refactoring. Doesn't look
like we still need it, and only causing issues with stuck
animations.

Test: go/wm-smoke
Test: Dock task from recents
Change-Id: Ibb3543d15f42fc7689c3ad705aee693eba93e8b7
Fixes: 77993227
2018-04-20 16:50:25 +02:00
TreeHugger Robot
5e12ebfffd Merge "Defer resizing invisible stacks while drag resizing" into pi-dev 2018-04-20 14:43:38 +00:00
Tomasz Wasilczyk
74a2955d35 Merge "Don't check program selector's type for equality." into pi-dev
am: a2015451a7

Change-Id: Id2bf66e26c54a2a8cc86b408b240d6984fb5b97b
2018-04-20 07:02:48 -07:00
Tomasz Wasilczyk
a2015451a7 Merge "Don't check program selector's type for equality." into pi-dev 2018-04-20 13:49:39 +00:00
Abodunrinwa Toki
33fa382b8f SmartLinkify - handle keyboard clicks
Bug: 77998709
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Change-Id: Ibb95a736248643949a7b521368374084f9f133ca
2018-04-20 14:37:23 +01:00
Adrian Roos
a6d6aab0e0 Defer resizing invisible stacks while drag resizing
Works around a source of jank when drag resizing in split
screen mode: instead of immediately resizing the (potentially
numerous) invisible secondary stacks, we defer that until
the user lets go of the handle.

Change-Id: I3b9faa83005fa86185d4e51b2849e3a826b7f6a9
Fixes: 78214347
Test: Open a gazillion (resizeable) tasks. Enter split screen. Drag handle, verify there is no jank
Test: atest RectTest
2018-04-20 15:09:02 +02:00
Chalard Jean
1bb54ae872 Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev
am: f12a2130a4

Change-Id: I4b739c56e658690532ae9deb0b9a3bc9b2adf8b0
2018-04-20 04:49:43 -07:00
TreeHugger Robot
f12a2130a4 Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev 2018-04-20 11:23:56 +00:00
Mathew Inwood
9e2b236462 Merge "StrictMode: fix non-SDK API usage detection." into pi-dev
am: c72ee1a4f2

Change-Id: If0db894c3cb9660eb187280cda21423866387799
2018-04-20 01:20:19 -07:00
Mathew Inwood
c72ee1a4f2 Merge "StrictMode: fix non-SDK API usage detection." into pi-dev 2018-04-20 08:04:07 +00:00
Chalard Jean
9419b11458 Add the list of private DNS addresses to LinkProperties
Test: atest android.net.LinkPropertiesTest, also new tests pass
Bug: 73641539
Change-Id: If33a35b1354a67db09411ff098f20064797296ad
2018-04-20 16:48:43 +09:00
Jeff Sharkey
37bbe98e86 Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
am: ddb15c471c

Change-Id: Ieccbac3a53b14f196a3ceb7924f7bb6880660c97
2018-04-19 19:55:24 -07:00
Jeff Sharkey
ddb15c471c Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev 2018-04-20 02:38:01 +00:00
TreeHugger Robot
1c75189a0a Merge "Fix the implementation of BluetoothCodecStatus.equals()" into pi-dev 2018-04-20 02:12:09 +00:00
Winson Chung
c39572a1bf Merge "Workaround to ensure we cancel the recents animation prior to starting home" into pi-dev
am: 1c0d00fac4

Change-Id: Iaf7247b5134efe7334edfa0d16a56fb8b31af392
2018-04-19 19:07:23 -07:00
Winson Chung
1c0d00fac4 Merge "Workaround to ensure we cancel the recents animation prior to starting home" into pi-dev 2018-04-20 01:54:09 +00:00
Pavlin Radoslavov
cc7c09a8bb Merge "Fix the implementation of BluetoothCodecStatus.equals()" am: 3a1ca762c9
am: 493dbf789f

Change-Id: I5e10a7e35a7befe7d88cd875d7dbcc9b6a7bbb8f
2018-04-19 18:08:38 -07:00
Pavlin Radoslavov
493dbf789f Merge "Fix the implementation of BluetoothCodecStatus.equals()"
am: 3a1ca762c9

Change-Id: I159c2128068021b5ca5e0a7bf3eae218de0bdf1b
2018-04-19 17:59:36 -07:00
Pavlin Radoslavov
a291ce625a Fix the implementation of BluetoothCodecStatus.equals()
Previously, the BluetoothCodecStatus.equals() implementation
was incorrect when comparing arrays of capabilities.
In the new implementation, the arrays are compared correctly,
and also the ordering of the capabilities in each array is ignored.

Also, added unit tests for class BluetoothCodecConfig and class
BluetoothCodecStatus.

Bug: 73404858
Bug: 73379307
Test: Unit tests (in frameworks/base)
  runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecConfigTest.java
  runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecStatusTest.java

Change-Id: If22087465397b7c4175c33f7d1909a15d957fb24
Merged-In: If22087465397b7c4175c33f7d1909a15d957fb24
(cherry picked from commit 9d36e6babc)
2018-04-19 17:26:31 -07:00
Felipe Leme
76af91dddb Merge changes from topic "revert_save_info" into pi-dev
am: 4dddd61fa8

Change-Id: Iff89691076a2136bafa1130f97cb71fa1177737d
2018-04-19 16:55:11 -07:00
TreeHugger Robot
4dddd61fa8 Merge changes from topic "revert_save_info" into pi-dev
* changes:
  Document compatibility mode limitations.
  Revert "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode."
2018-04-19 23:32:46 +00:00