Commit Graph

83137 Commits

Author SHA1 Message Date
Bernardo Rufino
d2e2c3a6e4 Merge "Check self permission in BackupManager#isBackupServiceActive" into pi-dev am: ad8159bea0
am: e348c14524

Change-Id: Ic31eabf98521d0823b6329914809dcfd937e33fe
2018-04-24 05:29:34 -07:00
Bernardo Rufino
e348c14524 Merge "Check self permission in BackupManager#isBackupServiceActive" into pi-dev
am: ad8159bea0

Change-Id: I3500ed3ae311d5df2ddf265a7132ac05d7eb536c
2018-04-24 05:20:29 -07:00
TreeHugger Robot
ad8159bea0 Merge "Check self permission in BackupManager#isBackupServiceActive" into pi-dev 2018-04-24 12:12:53 +00:00
Rubin Xu
b4c0d951bc Merge "Clarify SystemUpdatePolicy" into pi-dev am: 4019c39405
am: 5fbc0e59f5

Change-Id: Ia4f9475bac63504d9332bf576d9e12517e89d23a
2018-04-24 04:20:14 -07:00
Rubin Xu
5fbc0e59f5 Merge "Clarify SystemUpdatePolicy" into pi-dev
am: 4019c39405

Change-Id: I7d9129aaa404940391139acf2f40eca97fda9165
2018-04-24 04:10:58 -07:00
TreeHugger Robot
4019c39405 Merge "Clarify SystemUpdatePolicy" into pi-dev 2018-04-24 10:59:50 +00:00
Bernardo Rufino
2bf65c6e5c Check self permission in BackupManager#isBackupServiceActive
Old method only checked for IPC caller, method isn't an IPC, adding
check for self permission as well.

Bug: 78467264
Test: atest com.google.android.gts.devicepolicy.DeviceOwnerTest#testBackupServiceActive
Change-Id: If9eed90f2deaaf1a4f2376fdf1881e62ee8954fb
2018-04-24 11:41:13 +01:00
TreeHugger Robot
8e2b316e52 Merge "Avoid internal method call and its branching." 2018-04-24 09:43:27 +00:00
Selim Cinek
fe5e954e9e Merge changes from topic "notification_reply_action" into pi-dev am: 53790c1c8f
am: 0744f1d4b1

Change-Id: Ic0fdf693f31edc0402c43451610c051b2d8571cf
2018-04-24 02:37:39 -07:00
Selim Cinek
0744f1d4b1 Merge changes from topic "notification_reply_action" into pi-dev
am: 53790c1c8f

Change-Id: Ia6f227ca49a2004a2346da91cfea4f9a3fa65c47
2018-04-24 02:26:30 -07:00
Kenny Guy
d79d5c9bd6 Merge "Add spinner for smart replies." into pi-dev am: 5f18904a00
am: 06c4122c74

Change-Id: I5a2d775500b0a43eea281592f2325add233e7de1
2018-04-24 02:11:49 -07:00
Selim Cinek
53790c1c8f Merge changes from topic "notification_reply_action" into pi-dev
* changes:
  Cleaned up the paddings of the messaging layout and smart replies
  Changed the size of the largeIcon
  Moved the disabling from alpha to manual color blending
  Updated the color of the reply button to be more neutral
  Updated the reply icon
  Disabled reply action when pending intents are cancelled
  Split the reply icon permanently from the right icon
2018-04-24 09:10:38 +00:00
Kenny Guy
06c4122c74 Merge "Add spinner for smart replies." into pi-dev
am: 5f18904a00

Change-Id: I2eed8580057fe6565674c376ffd5cbdc5aaf0dcd
2018-04-24 02:02:47 -07:00
TreeHugger Robot
5f18904a00 Merge "Add spinner for smart replies." into pi-dev 2018-04-24 08:51:56 +00:00
Selim Cinek
1c72fa0249 Cleaned up the paddings of the messaging layout and smart replies
Refactored the code such that the reply icon's inset was substracted
from the overall paddings to make all of them consistent. This
will also help in the future as we don't have to update those
paddings manually anymore.

Test: test all sorts of combinations with Notify
Change-Id: I8c6c9951bc73c88d95cb443c8e618c7adca7ebd3
Fixes: 78441535
2018-04-24 14:33:29 +08:00
Selim Cinek
4717d862a0 Updated the color of the reply button to be more neutral
The primaryTextColor wasn't a good fit, because it was
drawing too much attention being pure black. We're now
taking the default color instead. It's also used for
active permissions now.

Test: add notification, look at reply button.
Change-Id: If390c66e927a92a1115250abb7254fafe81b054c
Fixes: 72750728
2018-04-24 13:05:56 +08:00
Selim Cinek
d83203cde4 Disabled reply action when pending intents are cancelled
Previously the user could open inline reply even when the
action was already cancelled. This also enables listening
to pending intent cancellations.

Test: manual
Fixes: 77811784
Change-Id: I4ae164081c6abdeb60a8e78d61bf5e4f26cca1d3
2018-04-24 13:05:53 +08:00
TreeHugger Robot
3efd16607a Merge "Add @NonNull annotation to getDecorView()" 2018-04-24 04:19:19 +00:00
TreeHugger Robot
0827873c47 Merge "Removed applyColorMod method in favor of individually setting properties." 2018-04-24 00:48:54 +00:00
Winson Chung
7f12b45892 Merge "Expose API to hide the IME during a recents animation" into pi-dev am: 6fab40d82c
am: bd41ceda0b

Change-Id: Ieb8eaa08dc2477ca75b7ba58a8e3e715463462e5
2018-04-23 17:35:00 -07:00
Winson Chung
bd41ceda0b Merge "Expose API to hide the IME during a recents animation" into pi-dev
am: 6fab40d82c

Change-Id: I8e70b7ae5d74d3dd85461bb13fcbff16f718d2c0
2018-04-23 17:24:36 -07:00
Winson Chung
a840c328e7 Expose API to hide the IME during a recents animation
Bug: 73285089
Test: Swipe up from app with IME open, ensure that it closes
Change-Id: I95ce59291f11285c853e8b3029638119c21f7e38
2018-04-23 16:20:27 -07:00
Nader Jawad
e6a6321a92 Removed applyColorMod method in favor of individually setting
properties.

Created dedicated applyXfermode, applyColorFilter and applyAlpha methods
to ensure that properties are not being overwritten unnecessarily

Fixes: 30167384
Test: Re-ran atest CtsWidgeTestCases:ImageViewTest

Change-Id: Ie4a18172dbf222559ace1b740a6c6fdfe33f4dfe
2018-04-23 16:00:49 -07:00
Winson Chung
131ac05712 Merge "Add windowing mode to task snapshot." into pi-dev am: 167710981c
am: ec1e188e67

Change-Id: If2193c37570deb762d7ae74fcbda4c3d9fd61729
2018-04-23 15:46:34 -07:00
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
53370a7894 Merge "Rate limit battery external stats collection in takeUidSnapshot(s)." into pi-dev am: 6bc6e21be7
am: ec9e20a1d9

Change-Id: Ifbc3b63ce0173c7f066ed3f5a360c0cca53f1814
2018-04-23 15:08:39 -07: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
c593d45451 Merge "ViewRoot: Check Surface validity before initializing renderer from draw()." into pi-dev am: cef96f69d7
am: c595c5c044

Change-Id: I7d364bdb71b47d1400a5db1775966fe6a6daa02b
2018-04-23 13:07:12 -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
Jake Wharton
fe16dfe76d Avoid internal method call and its branching.
This is a simple check that can be done locally.

Test: TextUtilsTest.java
Change-Id: I00f2a4fd087aa98ece2c3aa032e106496663b13f
2018-04-23 15:34:57 -04: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
TreeHugger Robot
d0cf9774b0 Merge "Verify best signature algorithms of all signers" 2018-04-23 19:14:21 +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
Kenny Guy
a0f6de8ab2 Add spinner for smart replies.
Add a spinner to MessagingGroup that is enabled
when the user has clicked on a smart reply.

Bug: 73607490
Test: atest SystemUiTests

Change-Id: I4d892c19b5df2b443761819929a83f016967e217
2018-04-23 18:58:19 +01:00
Rubin Xu
fcf3d6e5e2 Clarify SystemUpdatePolicy
Bug: 69734091
Test: make ds-docs
Change-Id: Ibd40f4c6bdc2e70ffe41c785c5a5b389fbeabd78
2018-04-23 16:40:44 +01:00
Jorim Jaggi
99ae19d125 Merge "Remove prolonged animations" into pi-dev am: 5bdf9530a0
am: 92cb00c2e4

Change-Id: Ibab85ea0385f09ac332553e51b13c4638c6d6d98
2018-04-23 06:44:11 -07: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
Selim Cinek
384804b42d Split the reply icon permanently from the right icon
Previously these would overlap, but they are now completely
separate.

Test: ensure that all notification styles still work with the new affordance.
Change-Id: I16f5f863b4afac27494a4a7615631bca240ca532
Fixes: 72750728
2018-04-23 16:19:21 +08:00
Jeff Sharkey
c50d08a807 Merge "Extend adoptable override to force on or off." into pi-dev am: 130a2503d8
am: 64a615eefe

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

Change-Id: Ia05f8c33ce038d76c3c1753ac58b6b82a3b6a679
2018-04-20 17:25:23 -07: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