Commit Graph

91315 Commits

Author SHA1 Message Date
Victor Hsieh
2f2ced93e3 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
2018-04-20 15:45:37 -07:00
Jeff Sharkey
4cdf6e58ed Merge "Give CTS a way to force-poll network stats." into pi-dev am: 46e58e1b40
am: 77c7b732c4

Change-Id: I93be7a46fc345efc31e98975c65a287f2d344220
2018-04-20 14:07:19 -07:00
Julia Reynolds
4c6bb14007 Merge "GetActiveNotifications should never return null" into pi-dev am: 66dfd01292
am: a643f89ce1

Change-Id: I6ab090f262e819babc334a9c1a41bc1cb4920c2e
2018-04-20 13:54:52 -07: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
Abodunrinwa Toki
85767df8cf Merge "SmartLinkify - handle keyboard clicks" into pi-dev am: 686fab1464
am: f8a770a515

Change-Id: I534794c28c13fc44829427a1d4dd567fe683c6b9
2018-04-20 12:25:43 -07: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
Mihai Popa
a2d9c7430a Merge "No divider between floating toolbar item groups" into pi-dev am: cbfe423122
am: 33a030ccdf

Change-Id: I767a5453a141f23f794bed4ba00327e24d847515
2018-04-20 10:22:57 -07:00
Mihai Popa
33a030ccdf Merge "No divider between floating toolbar item groups" into pi-dev
am: cbfe423122

Change-Id: Ie1c2304fc59da877f3fc80a718113deb4eb1ae7c
2018-04-20 10:09:08 -07:00
TreeHugger Robot
cbfe423122 Merge "No divider between floating toolbar item groups" into pi-dev 2018-04-20 16:53:31 +00:00
Adrian Roos
4a3d9ff120 Merge "Defer resizing invisible stacks while drag resizing" into pi-dev am: 5e12ebfffd
am: 03d4aeda37

Change-Id: Ic4e21bcd38e09cd237fcf149ba308bfdbf77240d
2018-04-20 08:07:53 -07: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
TreeHugger Robot
5e12ebfffd Merge "Defer resizing invisible stacks while drag resizing" into pi-dev 2018-04-20 14:43:38 +00:00
Tomasz Wasilczyk
9c37eae3b0 Merge "Don't check program selector's type for equality." into pi-dev am: a2015451a7
am: 74a2955d35

Change-Id: I2bcfc30020e0ee9bdee8e38dc124c9ea49df5ceb
2018-04-20 07:11:25 -07: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
1df73dd267 Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev am: f12a2130a4
am: 1bb54ae872

Change-Id: I6bdbef78d078d68534c8e07e9af031ce374560ef
2018-04-20 04:59:52 -07: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
Mihai Popa
66d41f87ea No divider between floating toolbar item groups
The CL removes the vertical divider that used to exist between adjacent
menu item groups in the floating toolbar, as well as the extra padding
between these, in order to adapt to the new UX requirements. The CL also
centers the text view inside a button, when there is no icon shown at
the left of the text view. This is only relevant when the minimum size
of the button is larger than the text measured width, and we want the
text to be centered inside the button in this case.

Bug: 74032743
Test: manual testing
Change-Id: I309c729eb842d9388066bfb43eb18f33dbfe10b8
2018-04-20 11:05:47 +00:00
Peter Visontay
c4523fcd78 Merge "Add unit test for AppOps logic where a different op is used to control an app op." 2018-04-20 10:55:09 +00:00
Mathew Inwood
427d1cbb24 Merge "StrictMode: fix non-SDK API usage detection." into pi-dev am: c72ee1a4f2
am: 9e2b236462

Change-Id: I2def7ae679f683c22093349ffdab33d9009f20da
2018-04-20 01:30:42 -07: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
3b25e5306c Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev am: ddb15c471c
am: 37bbe98e86

Change-Id: If8cfddaf96d28b3815dd6dca6aa52a7b9bd15da6
2018-04-19 20:08:03 -07: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
Winson Chung
c1f6a578e1 Merge "Workaround to ensure we cancel the recents animation prior to starting home" into pi-dev am: 1c0d00fac4
am: c39572a1bf

Change-Id: Ic2e3c3230b8e17f502b23a20053169b39b76c032
2018-04-19 19:42:10 -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
abc9b723aa Merge "Merge "Fix the implementation of BluetoothCodecStatus.equals()" am: 3a1ca762c9 am: 493dbf789f" into pi-dev-plus-aosp
am: f6cd5882fa

Change-Id: Ibcd642fd8a56d6f62a1eda298c4b18db48953ab0
2018-04-19 18:53:01 -07: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
7ea5b41978 Merge changes from topic "revert_save_info" into pi-dev am: 4dddd61fa8
am: 76af91dddb

Change-Id: Ib7e1b48958a5a92dbf5bb10eb3fc58b9baa8f242
2018-04-19 17:17:46 -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
Abodunrinwa Toki
2933d7b687 Merge "Fix non-unique PendingIntent issue with TCImpl." into pi-dev am: 993890fbf4
am: 10fa03ab38

Change-Id: I9bdd75a4116f2f7d468dc0e6adbfe406e6b10606
2018-04-19 15:45:16 -07:00
Felipe Leme
9c05605f52 Document compatibility mode limitations.
Test: mmm -j108 frameworks/base/:doc-comment-check-docs

Fixes: 77655074

Change-Id: I527d882850442c7e6e9379b1b423673885e07f2b
2018-04-19 15:26:48 -07:00
Felipe Leme
a7f3e9c7cb Revert "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode."
Save has many limitations on compat mode, so we better not change the SaveInfo
behavior but rather document then.

This reverts commit 4f74a018c8.

Test: atest CtsAutoFillServiceTestCases:VirtualContainerActivityTest \
CtsAutoFillServiceTestCases:VirtualContainerActivityCompatModeTest

Bug: 77655074

Change-Id: I36bd28ca546dcedefe75de7815b76b8b5827aee3
2018-04-19 15:25:49 -07:00
Abodunrinwa Toki
10fa03ab38 Merge "Fix non-unique PendingIntent issue with TCImpl." into pi-dev
am: 993890fbf4

Change-Id: Ie71ca3cc2144b6f700f1e9376fc2f571d3e19ce7
2018-04-19 15:20:09 -07:00